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
12e57440
Commit
12e57440
authored
Mar 30, 2021
by
linruibiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
整改接口
parent
29540bcf
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
42 additions
and
56 deletions
+42
-56
DeptController.java
...ain/java/com/syc/slm/slmbi/controller/DeptController.java
+3
-5
InstrumentPanelConfigController.java
...slm/slmbi/controller/InstrumentPanelConfigController.java
+15
-13
InstrumentPanelController.java
...m/syc/slm/slmbi/controller/InstrumentPanelController.java
+3
-6
InstrumentPanelGroupController.java
.../slm/slmbi/controller/InstrumentPanelGroupController.java
+6
-11
InstrumentPanelPermissionController.java
...slmbi/controller/InstrumentPanelPermissionController.java
+5
-3
PositionController.java
...java/com/syc/slm/slmbi/controller/PositionController.java
+3
-2
UserController.java
...ain/java/com/syc/slm/slmbi/controller/UserController.java
+1
-2
VariableController.java
...java/com/syc/slm/slmbi/controller/VariableController.java
+6
-14
No files found.
src/main/java/com/syc/slm/slmbi/controller/DeptController.java
View file @
12e57440
...
...
@@ -20,18 +20,16 @@ import java.util.List;
**/
@RequestMapping
(
"/depts"
)
@RestController
@Api
(
value
=
"部门信息接口"
,
description
=
"部门信息接口"
)
@Api
(
value
=
"部门信息接口"
,
description
=
"部门信息接口"
)
public
class
DeptController
{
@Autowired
private
DeptService
deptService
;
@GetMapping
@ApiOperation
(
"部门查询"
)
@ApiImplicitParam
(
name
=
"deptName"
,
value
=
"部门名称"
)
public
R
<
List
<
DeptVo
>>
selectDeptList
(
@RequestParam
(
value
=
"deptName"
,
required
=
false
)
String
deptName
)
{
@ApiImplicitParam
(
name
=
"deptName"
,
value
=
"部门名称"
)
public
R
<
List
<
DeptVo
>>
selectDeptList
(
@RequestParam
(
value
=
"deptName"
,
required
=
false
)
String
deptName
)
{
return
R
.
ok
(
deptService
.
selectDeptList
(
deptName
));
}
}
src/main/java/com/syc/slm/slmbi/controller/InstrumentPanelConfigController.java
View file @
12e57440
...
...
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping
(
"/panel/configs"
)
@RestController
@Api
(
value
=
"仪表板样式以及数据配置"
,
description
=
"仪表板样式以及数据配置"
)
@Api
(
value
=
"仪表板样式以及数据配置"
,
description
=
"仪表板样式以及数据配置"
)
public
class
InstrumentPanelConfigController
{
@Autowired
...
...
@@ -30,31 +30,33 @@ public class InstrumentPanelConfigController {
@PostMapping
@ApiOperation
(
"保存仪表板样式以及数据配置"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"instrumentPanelId"
,
value
=
"仪表板id"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"visitPermission"
,
value
=
"访问权限"
,
required
=
true
,
dataTypeClass
=
InstrumentPanelPermissionDTO
.
class
),
@ApiImplicitParam
(
name
=
"configDetails"
,
value
=
"仪表板配置详情"
,
required
=
true
)
})
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"instrumentPanelId"
,
value
=
"仪表板id"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"visitPermission"
,
value
=
"访问权限"
,
required
=
true
,
dataTypeClass
=
InstrumentPanelPermissionDTO
.
class
),
@ApiImplicitParam
(
name
=
"configDetails"
,
value
=
"仪表板配置详情"
,
required
=
true
)})
public
R
<
Boolean
>
saveInstrumentPanelConfig
(
@RequestBody
InstrumentPanelConfigDTO
config
)
{
return
R
.
ok
(
instrumentPanelConfigService
.
saveInstrumentPanelConfig
(
config
,
1
));
}
@PostMapping
(
"save-push"
)
@ApiOperation
(
"保存发布仪表板样式以及数据配置"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"instrumentPanelId"
,
value
=
"仪表板id"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"visitPermission"
,
value
=
"访问权限"
,
required
=
true
,
dataTypeClass
=
InstrumentPanelPermissionDTO
.
class
),
@ApiImplicitParam
(
name
=
"configDetails"
,
value
=
"仪表板配置详情"
,
required
=
true
)
})
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"instrumentPanelId"
,
value
=
"仪表板id"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"visitPermission"
,
value
=
"访问权限"
,
required
=
true
,
dataTypeClass
=
InstrumentPanelPermissionDTO
.
class
),
@ApiImplicitParam
(
name
=
"configDetails"
,
value
=
"仪表板配置详情"
,
required
=
true
)})
public
R
<
Boolean
>
saveAndPushConfig
(
@RequestBody
InstrumentPanelConfigDTO
config
)
{
return
R
.
ok
(
instrumentPanelConfigService
.
saveInstrumentPanelConfig
(
config
,
2
));
}
@GetMapping
(
"{panelId}"
)
@ApiOperation
(
"根据仪表板id获取仪表板配置"
)
@ApiImplicitParam
(
name
=
"instrumentPanelId"
,
value
=
"仪表板id"
)
public
R
<
InstrumentPanelConfigVo
>
getInstrumentPanelConfigByInstrumentPanelId
(
@PathVariable
(
"panelId"
)
String
panelId
)
{
public
R
<
InstrumentPanelConfigVo
>
getInstrumentPanelConfigByInstrumentPanelId
(
@PathVariable
(
"panelId"
)
String
panelId
)
{
return
R
.
ok
(
instrumentPanelConfigService
.
getInstrumentPanelConfigByInstrumentPanelId
(
panelId
));
}
...
...
src/main/java/com/syc/slm/slmbi/controller/InstrumentPanelController.java
View file @
12e57440
...
...
@@ -23,16 +23,16 @@ import java.util.List;
**/
@RestController
@RequestMapping
(
"/panels"
)
@Api
(
value
=
"仪表板"
,
description
=
"仪表板配置接口"
)
@Api
(
value
=
"仪表板"
,
description
=
"仪表板配置接口"
)
public
class
InstrumentPanelController
{
@Autowired
private
InstrumentPanelService
instrumentPanelService
;
@GetMapping
@ApiOperation
(
"仪表板列表"
)
public
R
<
IPage
<
InstrumentPanelVo
>>
selectInstrumentPanelList
(
@RequestBody
InstrumentPanelDTO
where
)
{
//where :{name:'',creator:'',updater:'',startDate:'' ,endDate:'',recordStatus:''}
public
R
<
IPage
<
InstrumentPanelVo
>>
selectInstrumentPanelList
(
@RequestBody
InstrumentPanelDTO
where
)
{
//where :{name:'',creator:'',updater:'',startDate:'' ,endDate:'',recordStatus:''}
return
R
.
ok
(
instrumentPanelService
.
selectInstrumentPanelList
(
where
));
}
...
...
@@ -63,14 +63,12 @@ public class InstrumentPanelController {
return
R
.
ok
(
instrumentPanelService
.
delPushInstrumentPanel
(
id
));
}
@PostMapping
(
"/save-as"
)
@ApiOperation
(
"另存为"
)
public
R
<
Boolean
>
saveAs
(
@RequestBody
InstrumentPanelDTO
instrumentPanelDTO
)
{
return
R
.
ok
(
instrumentPanelService
.
saveInstrumentPanel
(
instrumentPanelDTO
));
}
@PostMapping
(
"/show-recovery-btn/{id}"
)
@ApiOperation
(
"是否显示恢复按钮"
)
@ApiImplicitParam
(
name
=
"id"
,
value
=
"仪表板id"
,
required
=
true
)
...
...
@@ -85,5 +83,4 @@ public class InstrumentPanelController {
return
R
.
ok
(
instrumentPanelService
.
recoveryInstrumentPanel
(
id
));
}
}
src/main/java/com/syc/slm/slmbi/controller/InstrumentPanelGroupController.java
View file @
12e57440
...
...
@@ -30,25 +30,23 @@ public class InstrumentPanelGroupController {
@Autowired
private
InstrumentPanelGroupService
instrumentPanelGroupService
;
@GetMapping
@ApiOperation
(
"第一次进入页面,或者点击查询,获取全部分组下的仪表板数据,以及分组数据"
)
@ApiImplicitParam
(
name
=
"name"
,
value
=
"分组名称或者仪表板名称"
)
public
R
<
List
<
PanelGroupVo
>>
selectInstrumentPanelGroupList
(
@RequestParam
(
value
=
"name"
,
required
=
false
)
String
name
)
{
public
R
<
List
<
PanelGroupVo
>>
selectInstrumentPanelGroupList
(
@RequestParam
(
value
=
"name"
,
required
=
false
)
String
name
)
{
return
R
.
ok
(
instrumentPanelGroupService
.
loadTrees
(
name
));
}
@GetMapping
(
"/next-nodes"
)
@ApiOperation
(
"点击节点获取,该分组下的仪表板信息,以及分组数据"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"groupId"
,
value
=
"分组id"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"分组名称或者仪表板名称"
)
})
public
R
<
List
<
PanelGroupVo
>>
findNextNodes
(
@RequestParam
(
"groupId"
)
String
groupId
,
@RequestParam
(
value
=
"name"
,
required
=
false
)
String
name
)
{
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"groupId"
,
value
=
"分组id"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"分组名称或者仪表板名称"
)})
public
R
<
List
<
PanelGroupVo
>>
findNextNodes
(
@RequestParam
(
"groupId"
)
String
groupId
,
@RequestParam
(
value
=
"name"
,
required
=
false
)
String
name
)
{
return
R
.
ok
(
instrumentPanelGroupService
.
findNextNodes
(
groupId
,
name
));
}
@GetMapping
(
"/selectInstrumentPanelGroups"
)
@ApiOperation
(
"获取所有的仪表板分组以及分组下的仪表板以及仪表板下的组件"
)
public
R
<
List
<
InstrumentPanelGroupVo
>>
selectInstrumentPanelGroups
()
{
...
...
@@ -61,19 +59,16 @@ public class InstrumentPanelGroupController {
return
R
.
ok
(
instrumentPanelGroupService
.
saveInstrumentPanelGroup
(
group
));
}
@PutMapping
@ApiOperation
(
"更新仪表板分组"
)
public
R
<
Boolean
>
updateInstrumentPanelGroup
(
@RequestBody
InstrumentPanelGroupDTO
group
)
{
return
R
.
ok
(
instrumentPanelGroupService
.
updateInstrumentPanelGroup
(
group
));
}
@DeleteMapping
(
"/{groupId}"
)
@ApiOperation
(
"删除仪表板分组"
)
public
R
<
Boolean
>
delInstrumentPanelGroup
(
@PathVariable
String
groupId
)
{
return
R
.
ok
(
instrumentPanelGroupService
.
delInstrumentPanelGroup
(
groupId
));
}
}
src/main/java/com/syc/slm/slmbi/controller/InstrumentPanelPermissionController.java
View file @
12e57440
...
...
@@ -19,7 +19,7 @@ import java.util.List;
* @author : lin
* @date : 2021-03-25 18:54
**/
@Api
(
value
=
"仪表板权限控制"
,
description
=
"仪表板权限控制"
)
@Api
(
value
=
"仪表板权限控制"
)
@RestController
@RequestMapping
(
"/panel/permissions"
)
public
class
InstrumentPanelPermissionController
{
...
...
@@ -43,14 +43,16 @@ public class InstrumentPanelPermissionController {
@PostMapping
(
"/copy-to/{panelId}"
)
@ApiOperation
(
"将仪表板权限复制给其他仪表板"
)
@ApiImplicitParam
(
name
=
"panelId"
,
value
=
"其他仪表板id"
,
required
=
true
)
public
R
<
Boolean
>
saveCopyToOtherInstrumentPanelPermission
(
@RequestBody
List
<
InstrumentPanelPermissionDTO
>
permissions
,
@PathVariable
(
"panelId"
)
String
panelId
)
{
public
R
<
Boolean
>
saveCopyToOtherInstrumentPanelPermission
(
@RequestBody
List
<
InstrumentPanelPermissionDTO
>
permissions
,
@PathVariable
(
"panelId"
)
String
panelId
)
{
return
R
.
ok
(
instrumentPanelPermissionService
.
saveCopyToOtherInstrumentPanelPermission
(
permissions
,
panelId
));
}
@GetMapping
(
"/{panelId}"
)
@ApiOperation
(
"根据仪表板id获取仪表板权限"
)
@ApiImplicitParam
(
name
=
"panelId"
,
value
=
"仪表板id"
,
required
=
true
)
public
R
<
List
<
InstrumentPanelPermissionVo
>>
selectInstrumentPanelPermissionById
(
@PathVariable
(
"panelId"
)
String
panelId
)
{
public
R
<
List
<
InstrumentPanelPermissionVo
>>
selectInstrumentPanelPermissionById
(
@PathVariable
(
"panelId"
)
String
panelId
)
{
return
R
.
ok
(
instrumentPanelPermissionService
.
selectInstrumentPanelPermissionById
(
panelId
));
}
}
src/main/java/com/syc/slm/slmbi/controller/PositionController.java
View file @
12e57440
...
...
@@ -18,7 +18,7 @@ import java.util.List;
* @author : lin
* @date : 2021-03-25 17:26
**/
@Api
(
value
=
"职位查询列表"
,
description
=
"职位查询列表"
)
@Api
(
value
=
"职位查询列表"
)
@RestController
@RequestMapping
(
"/positions"
)
public
class
PositionController
{
...
...
@@ -29,7 +29,8 @@ public class PositionController {
@GetMapping
@ApiOperation
(
"职位查询列表"
)
@ApiImplicitParam
(
name
=
"positionName"
,
value
=
"职位名称"
)
public
R
<
List
<
PositionVo
>>
selectPositionList
(
@RequestParam
(
value
=
"positionName"
,
required
=
false
)
String
positionName
)
{
public
R
<
List
<
PositionVo
>>
selectPositionList
(
@RequestParam
(
value
=
"positionName"
,
required
=
false
)
String
positionName
)
{
return
R
.
ok
(
positionWorkService
.
selectPositionList
(
positionName
));
}
}
src/main/java/com/syc/slm/slmbi/controller/UserController.java
View file @
12e57440
...
...
@@ -18,7 +18,7 @@ import java.util.List;
* @author : lin
* @date : 2021-03-25 18:45
**/
@Api
(
value
=
"用户信息"
,
description
=
"用户信息接口"
)
@Api
(
value
=
"用户信息"
,
description
=
"用户信息接口"
)
@RestController
@RequestMapping
(
"/users"
)
public
class
UserController
{
...
...
@@ -33,5 +33,4 @@ public class UserController {
return
R
.
ok
(
userService
.
selectUserList
(
userName
));
}
}
src/main/java/com/syc/slm/slmbi/controller/VariableController.java
View file @
12e57440
...
...
@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
import
java.util.List
;
/**
* slm-bi
* 用户信息
...
...
@@ -36,24 +35,20 @@ public class VariableController {
@GetMapping
@ApiOperation
(
"获取变量列表"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"sourceId"
,
value
=
"变量来源"
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"sourceId"
,
value
=
"变量来源"
),
@ApiImplicitParam
(
name
=
"deviceId"
,
value
=
"所属设备"
),
@ApiImplicitParam
(
name
=
"variableName"
,
value
=
"变量名称"
),
@ApiImplicitParam
(
name
=
"description"
,
value
=
"描述"
)
})
@ApiImplicitParam
(
name
=
"description"
,
value
=
"描述"
)})
public
R
<
IPage
<
VariableVo
>>
getVariableList
(
@RequestBody
VariableDTO
variableDTO
)
{
return
R
.
ok
(
variableService
.
getVariableList
(
variableDTO
));
}
@GetMapping
(
"real-time"
)
@ApiOperation
(
"获取变量实时数据"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"variableIds"
,
value
=
"变量集合ids"
,
required
=
true
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"variableIds"
,
value
=
"变量集合ids"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"format"
,
value
=
"时间格式"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"interval"
,
value
=
"时间间隔,代表(天,时,分,秒)"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"deviceId"
,
value
=
"所属设备"
,
required
=
true
)
})
@ApiImplicitParam
(
name
=
"deviceId"
,
value
=
"所属设备"
,
required
=
true
)})
public
R
getVariableRealTimeDataList
(
@RequestBody
VariableDTO
variableDTO
)
{
return
R
.
ok
();
}
...
...
@@ -70,16 +65,13 @@ public class VariableController {
return
R
.
ok
(
variableService
.
getVariableDeviceList
());
}
@GetMapping
(
"history"
)
@ApiOperation
(
"获取变量历史数据"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"variableIds"
,
value
=
"变量集合ids"
,
required
=
true
),
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"variableIds"
,
value
=
"变量集合ids"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"deviceId"
,
value
=
"所属设备"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"statisticsType"
,
value
=
"统计类型,代表(合计值,平均值,最大值,最小值)"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"startTime"
,
value
=
"开始时间"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"endTime"
,
value
=
"结束时间"
,
required
=
true
)
})
@ApiImplicitParam
(
name
=
"endTime"
,
value
=
"结束时间"
,
required
=
true
)})
public
R
getVariableHistoryDataList
(
@RequestBody
VariableDTO
variableDTO
)
{
return
R
.
ok
();
}
...
...
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