Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
indicators
Overview
Overview
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
zhangkb
indicators
Commits
7a6d31dc
Commit
7a6d31dc
authored
Aug 03, 2020
by
zhangkb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改返回状态
parent
410b5d0c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
IndCatalogCtrl.java
...om/keymobile/indicators/api/hytobacco/IndCatalogCtrl.java
+5
-0
IndCatalogService.java
...obile/indicators/service/hytobacco/IndCatalogService.java
+4
-4
No files found.
src/main/java/com/keymobile/indicators/api/hytobacco/IndCatalogCtrl.java
View file @
7a6d31dc
...
@@ -40,7 +40,12 @@ public class IndCatalogCtrl {
...
@@ -40,7 +40,12 @@ public class IndCatalogCtrl {
}
else
{
}
else
{
message
=
"修改基础项目录:{}"
;
message
=
"修改基础项目录:{}"
;
}
}
try
{
indCatalog
=
indCatalogService
.
saveOrUpdate
(
indCatalog
);
indCatalog
=
indCatalogService
.
saveOrUpdate
(
indCatalog
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
throw
new
ApiException
(
"存在同名目录110"
);
}
LogManager
.
logInfo
(
Constants
.
LOG_INDICATOR_BASE_INDI_API
,
message
,
indCatalog
.
getCatalogName
());
LogManager
.
logInfo
(
Constants
.
LOG_INDICATOR_BASE_INDI_API
,
message
,
indCatalog
.
getCatalogName
());
return
indCatalog
.
getId
();
return
indCatalog
.
getId
();
}
}
...
...
src/main/java/com/keymobile/indicators/service/hytobacco/IndCatalogService.java
View file @
7a6d31dc
...
@@ -25,11 +25,11 @@ public class IndCatalogService {
...
@@ -25,11 +25,11 @@ public class IndCatalogService {
@Autowired
@Autowired
private
BaseIndDefMapper
baseIndDefMapper
;
private
BaseIndDefMapper
baseIndDefMapper
;
public
IndCatalog
saveOrUpdate
(
IndCatalog
indCatalog
)
throws
Api
Exception
{
public
IndCatalog
saveOrUpdate
(
IndCatalog
indCatalog
)
throws
Exception
{
if
(
indCatalog
.
getId
()==
null
)
{
//新增
if
(
indCatalog
.
getId
()==
null
)
{
//新增
if
(!
indCatalogMapper
.
findIsExist
(
indCatalog
.
getCatalogName
(),
indCatalog
.
getParentId
(),
if
(!
indCatalogMapper
.
findIsExist
(
indCatalog
.
getCatalogName
(),
indCatalog
.
getParentId
(),
indCatalog
.
getCode
()).
isEmpty
())
{
indCatalog
.
getCode
()).
isEmpty
())
{
throw
new
Api
Exception
(
"存在同名目录"
);
throw
new
Exception
(
"存在同名目录"
);
}
}
//保存
//保存
indCatalogMapper
.
insert
(
indCatalog
);
indCatalogMapper
.
insert
(
indCatalog
);
...
@@ -37,7 +37,7 @@ public class IndCatalogService {
...
@@ -37,7 +37,7 @@ public class IndCatalogService {
List
<
IndCatalog
>
dbList
=
indCatalogMapper
.
findIsExist
(
indCatalog
.
getCatalogName
(),
indCatalog
.
getParentId
(),
List
<
IndCatalog
>
dbList
=
indCatalogMapper
.
findIsExist
(
indCatalog
.
getCatalogName
(),
indCatalog
.
getParentId
(),
indCatalog
.
getCode
());
indCatalog
.
getCode
());
if
(!
dbList
.
isEmpty
()
&&
!
dbList
.
get
(
0
).
getId
().
equals
(
indCatalog
.
getId
()))
{
if
(!
dbList
.
isEmpty
()
&&
!
dbList
.
get
(
0
).
getId
().
equals
(
indCatalog
.
getId
()))
{
throw
new
Api
Exception
(
"存在同名目录"
);
throw
new
Exception
(
"存在同名目录"
);
}
}
}
}
//获取parentId拼接idPath
//获取parentId拼接idPath
...
@@ -47,7 +47,7 @@ public class IndCatalogService {
...
@@ -47,7 +47,7 @@ public class IndCatalogService {
}
else
{
}
else
{
IndCatalog
parentIndCatalog
=
indCatalogMapper
.
selectByPrimaryKey
(
indCatalog
.
getParentId
());
IndCatalog
parentIndCatalog
=
indCatalogMapper
.
selectByPrimaryKey
(
indCatalog
.
getParentId
());
if
(
parentIndCatalog
==
null
)
{
if
(
parentIndCatalog
==
null
)
{
throw
new
Api
Exception
(
"父节点不存在:parent catalog is not exist"
);
throw
new
Exception
(
"父节点不存在:parent catalog is not exist"
);
}
else
{
}
else
{
indCatalog
.
setIdPath
(
parentIndCatalog
.
getIdPath
()+
indCatalog
.
getId
()+
";"
);
indCatalog
.
setIdPath
(
parentIndCatalog
.
getIdPath
()+
indCatalog
.
getId
()+
";"
);
}
}
...
...
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