Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
7c415ff5
Commit
7c415ff5
authored
Aug 27, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改排序
parent
29ff8615
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
11 deletions
+9
-11
VehicleModelController.java
...om/xxfc/platform/vehicle/rest/VehicleModelController.java
+9
-11
No files found.
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java
View file @
7c415ff5
...
@@ -265,7 +265,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
...
@@ -265,7 +265,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
if
(
id
==
1
||
id
==
14
)
{
if
(
id
==
1
||
id
==
14
)
{
return
ObjectRestResponse
.
createFailedResult
(
ResultCode
.
FAILED_CODE
,
"The label cannot be deleted"
);
return
ObjectRestResponse
.
createFailedResult
(
ResultCode
.
FAILED_CODE
,
"The label cannot be deleted"
);
}
}
//2.进行逻辑删除
//2.进行逻辑删除
VehicleModel
vm
=
new
VehicleModel
();
VehicleModel
vm
=
new
VehicleModel
();
vm
.
setId
(
id
);
vm
.
setId
(
id
);
...
@@ -282,17 +281,17 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
...
@@ -282,17 +281,17 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
}
}
@ApiOperation
(
"查询所有"
)
//
@ApiOperation("查询所有")
@RequestMapping
(
value
=
"/findAll"
,
method
=
RequestMethod
.
GET
)
//
@RequestMapping(value = "/findAll", method = RequestMethod.GET)
@ResponseBody
//
@ResponseBody
public
ObjectRestResponse
findAll
()
{
//
public ObjectRestResponse findAll() {
VehicleModel
vehicleModel
=
new
VehicleModel
();
//
VehicleModel vehicleModel = new VehicleModel();
vehicleModel
.
setIsdel
(
0
);
//
vehicleModel.setIsdel(0);
return
ObjectRestResponse
.
succ
(
baseBiz
.
selectList
(
vehicleModel
));
//
return ObjectRestResponse.succ(baseBiz.selectList(vehicleModel));
}
//
}
@ApiOperation
(
"查询所有"
)
@ApiOperation
(
"查询所有"
)
@RequestMapping
(
value
=
"/
list
"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/
findAll
"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
@ResponseBody
public
ObjectRestResponse
getList
()
{
public
ObjectRestResponse
getList
()
{
Example
exa
=
Example
.
builder
(
VehicleModel
.
class
).
where
(
Example
exa
=
Example
.
builder
(
VehicleModel
.
class
).
where
(
...
@@ -349,7 +348,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
...
@@ -349,7 +348,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
e
.
printStackTrace
();
e
.
printStackTrace
();
TransactionAspectSupport
.
currentTransactionStatus
().
setRollbackOnly
();
TransactionAspectSupport
.
currentTransactionStatus
().
setRollbackOnly
();
throw
new
BaseException
(
ResultCode
.
UPDATE_VEHICLE_FAIL
);
throw
new
BaseException
(
ResultCode
.
UPDATE_VEHICLE_FAIL
);
}
}
}
}
}
}
\ No newline at end of file
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