Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
I
inspect
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
912协同工作系统
项目监控管理工具
inspect
Commits
9481332e
提交
9481332e
authored
4月 16, 2020
作者:
马晨俊
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mcj:新增关键技术管理、规则管理、评估报告管理的权限配置
上级
e074bbd2
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
17 行增加
和
13 行删除
+17
-13
EvaluationController.java
...ava/com/zjty/inspect/controller/EvaluationController.java
+7
-7
RuleController.java
...main/java/com/zjty/inspect/controller/RuleController.java
+5
-4
TechnologyController.java
...ava/com/zjty/inspect/controller/TechnologyController.java
+5
-2
没有找到文件。
src/main/java/com/zjty/inspect/controller/EvaluationController.java
浏览文件 @
9481332e
...
...
@@ -41,7 +41,7 @@ public class EvaluationController {
}
@ApiOperation
(
"根据用户名查询最新的报告输出"
)
@GetMapping
(
value
=
"/eva"
)
@AuthAnnotation
(
code
=
{
"800"
})
@AuthAnnotation
(
code
=
{
"
000
800"
})
public
ResponseEntity
getName
(
@RequestParam
String
name
,
@RequestParam
String
id
)
{
if
(
StringUtils
.
isEmpty
(
id
)||
id
.
equals
(
"null"
)){
Evaluation
e
=
evaluationService
.
findByName
(
name
);
...
...
@@ -60,7 +60,7 @@ public class EvaluationController {
}
@ApiOperation
(
"根据id查询输入"
)
@GetMapping
(
value
=
"/in/{name}"
)
@AuthAnnotation
(
code
=
{
"800"
})
@AuthAnnotation
(
code
=
{
"
000
800"
})
public
ResponseEntity
getInName
(
@PathVariable
String
name
)
{
Evaluation
evaluation
=
evaluationService
.
findById
(
name
);
if
(
evaluation
!=
null
){
...
...
@@ -72,7 +72,7 @@ public class EvaluationController {
@ApiOperation
(
"根据id查询输入"
)
@GetMapping
(
value
=
"/all/{id}"
)
@AuthAnnotation
(
code
=
{
"800"
})
@AuthAnnotation
(
code
=
{
"
000
800"
})
public
ResponseEntity
getInId
(
@PathVariable
String
id
)
{
Evaluation
evaluation
=
evaluationService
.
findById
(
id
);
if
(
evaluation
!=
null
){
...
...
@@ -83,7 +83,7 @@ public class EvaluationController {
@ApiOperation
(
"根据报告id查询excel输入"
)
@GetMapping
(
value
=
"/in/excel/{id}"
)
@AuthAnnotation
(
code
=
{
"800"
})
@AuthAnnotation
(
code
=
{
"
000
800"
})
public
ResponseEntity
exportInName
(
@PathVariable
String
id
)
{
Evaluation
evaluation
=
evaluationService
.
findById
(
id
);
if
(
evaluation
!=
null
){
...
...
@@ -101,7 +101,7 @@ public class EvaluationController {
*/
@PostMapping
(
value
=
"/{id}"
)
@ApiOperation
(
"修改评估报告"
)
@AuthAnnotation
(
code
=
{
"800"
})
@AuthAnnotation
(
code
=
{
"
000
800"
})
public
ResponseEntity
update
(
@RequestBody
Evaluation
evaluation
,
@PathVariable
String
id
){
evaluation
.
setId
(
id
);
evaluationService
.
update
(
evaluation
);
...
...
@@ -114,7 +114,7 @@ public class EvaluationController {
*/
@ApiOperation
(
"根据id删除评估报告"
)
@DeleteMapping
(
value
=
"/{id}"
)
@AuthAnnotation
(
code
=
{
"800"
})
@AuthAnnotation
(
code
=
{
"
000
800"
})
public
ResponseEntity
deleteById
(
@PathVariable
String
id
){
evaluationService
.
delete
(
id
);
return
ResponseEntity
.
ok
(
200
);
...
...
@@ -132,7 +132,7 @@ public class EvaluationController {
@ApiImplicitParam
(
name
=
"size"
,
value
=
"每页记录数"
,
required
=
true
,
paramType
=
"path"
,
dataType
=
"int"
)
})
@RequestMapping
(
value
=
"/search/{page}/{size}"
,
method
=
RequestMethod
.
POST
)
@AuthAnnotation
(
code
=
{
"800"
})
@AuthAnnotation
(
code
=
{
"
000
800"
})
public
ResponseEntity
findSearch
(
@RequestBody
Map
searchMap
,
@PathVariable
int
page
,
@PathVariable
int
size
){
Page
<
Evaluation
>
pageList
=
evaluationService
.
findSearch
(
searchMap
,
page
,
size
);
return
ResponseEntity
.
ok
(
new
PageResult
<
Evaluation
>(
pageList
.
getTotalElements
(),
pageList
.
getContent
())
);
...
...
src/main/java/com/zjty/inspect/controller/RuleController.java
浏览文件 @
9481332e
...
...
@@ -39,7 +39,7 @@ public class RuleController {
*/
@PostMapping
@ApiOperation
(
"新增规则"
)
@AuthAnnotation
(
code
=
{
"
1200"
,
"
1400"
})
@AuthAnnotation
(
code
=
{
"
001200"
,
"00
1400"
})
public
ResponseEntity
rule
(
@RequestBody
Rule
rule
){
log
.
info
(
"规则{}"
,
rule
);
Rule
rule1
=
ruleService
.
addRulePlus
(
rule
);
...
...
@@ -55,7 +55,7 @@ public class RuleController {
*/
@PostMapping
(
value
=
"/update"
)
@ApiOperation
(
"修改规则"
)
@AuthAnnotation
(
code
=
{
"
1200"
,
"
1400"
})
@AuthAnnotation
(
code
=
{
"
001200"
,
"00
1400"
})
public
ResponseEntity
update
(
@RequestBody
Rule
rule
){
ruleService
.
upRulePlus
(
rule
);
return
ResponseEntity
.
ok
(
200
);
...
...
@@ -67,7 +67,7 @@ public class RuleController {
*/
@ApiOperation
(
"根据数据封装删除规则"
)
@DeleteMapping
(
value
=
"/{id}"
)
@AuthAnnotation
(
code
=
{
"
1200"
,
"
1400"
})
@AuthAnnotation
(
code
=
{
"
001200"
,
"00
1400"
})
public
ResponseEntity
deleteByQo
(
@PathVariable
String
id
){
ruleService
.
deleteRulePlus
(
id
);
return
ResponseEntity
.
ok
(
200
);
...
...
@@ -88,6 +88,7 @@ public class RuleController {
@ApiImplicitParam
(
name
=
"size"
,
value
=
"每页记录数"
,
required
=
true
,
paramType
=
"path"
,
dataType
=
"int"
)
})
@RequestMapping
(
value
=
"/search/{page}/{size}"
,
method
=
RequestMethod
.
POST
)
@AuthAnnotation
(
code
=
{
"001200"
,
"001400"
})
public
ResponseEntity
findSearch
(
@RequestBody
Map
searchMap
,
@PathVariable
int
page
,
@PathVariable
int
size
){
Page
<
Rule
>
pageList
=
ruleService
.
findSearch
(
searchMap
,
page
,
size
);
return
ResponseEntity
.
ok
(
new
PageResult
<
Rule
>(
pageList
.
getTotalElements
(),
pageList
.
getContent
())
);
...
...
@@ -105,7 +106,7 @@ public class RuleController {
}
@PostMapping
(
"/importRules"
)
@ApiOperation
(
"导入所有规则"
)
@AuthAnnotation
(
code
=
{
"1200"
})
@AuthAnnotation
(
code
=
{
"
00
1200"
})
public
ResponseEntity
importRules
(
@RequestParam
(
"file"
)
MultipartFile
file
){
ruleService
.
importRules
(
file
);
return
null
;
...
...
src/main/java/com/zjty/inspect/controller/TechnologyController.java
浏览文件 @
9481332e
...
...
@@ -41,6 +41,7 @@ public class TechnologyController {
}
@GetMapping
(
"/names"
)
@ApiOperation
(
"获取所有关键技术name"
)
@AuthAnnotation
(
code
=
{
"001100"
})
public
ResponseEntity
getTechnologiesName
(){
return
ResponseEntity
.
ok
(
technologyService
.
findAllTechnologyNames
());
}
...
...
@@ -51,6 +52,7 @@ public class TechnologyController {
*/
@GetMapping
(
value
=
"/{name}"
)
@ApiOperation
(
"根据name获取所有关键技术"
)
@AuthAnnotation
(
code
=
{
"001100"
})
public
ResponseEntity
getTechnologies
(
@PathVariable
String
name
){
return
ResponseEntity
.
ok
(
technologyService
.
findAllTechnology
(
name
));
}
...
...
@@ -60,7 +62,7 @@ public class TechnologyController {
*/
@PostMapping
(
"/add"
)
@ApiOperation
(
"新添加关键技术"
)
@AuthAnnotation
(
code
=
{
"1100"
})
@AuthAnnotation
(
code
=
{
"
00
1100"
})
public
ResponseEntity
addTechnologies
(
@RequestBody
Technology
technology
){
technologyService
.
add
(
technology
);
return
ResponseEntity
.
ok
(
200
);
...
...
@@ -68,7 +70,7 @@ public class TechnologyController {
}
@PostMapping
(
value
=
"/{id}"
)
@ApiOperation
(
"修改关键技术"
)
@AuthAnnotation
(
code
=
{
"1100"
})
@AuthAnnotation
(
code
=
{
"
00
1100"
})
public
ResponseEntity
update
(
@RequestBody
Technology
technology
,
@PathVariable
String
id
){
technology
.
setId
(
id
);
technologyService
.
update
(
technology
);
...
...
@@ -87,6 +89,7 @@ public class TechnologyController {
@ApiImplicitParam
(
name
=
"size"
,
value
=
"每页记录数"
,
required
=
true
,
paramType
=
"path"
,
dataType
=
"int"
)
})
@RequestMapping
(
value
=
"/search/{page}/{size}"
,
method
=
RequestMethod
.
POST
)
@AuthAnnotation
(
code
=
{
"001100"
})
public
ResponseEntity
findSearch
(
@RequestBody
Map
searchMap
,
@PathVariable
int
page
,
@PathVariable
int
size
){
Page
<
Technology
>
pageList
=
technologyService
.
findSearch
(
searchMap
,
page
,
size
);
return
ResponseEntity
.
ok
(
new
PageResult
<
Technology
>(
pageList
.
getTotalElements
(),
pageList
.
getContent
())
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论