From 7a9deef40c60e1b0614acb7cd215a12829a8476d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Dec 2023 15:14:54 +0800
Subject: [PATCH] chore:测试提交
---
screen-manage/src/main/java/com/moral/api/controller/DivisorController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DivisorController.java b/screen-manage/src/main/java/com/moral/api/controller/DivisorController.java
index 7b52cf6..89d5b9a 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DivisorController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DivisorController.java
@@ -42,15 +42,14 @@
@Autowired
private DivisorService divisorService;
- @Autowired
- private DivisorMapper divisorMapper;
+
@PostMapping("insert")
@ApiOperation("������")
public ResultMessage insert(@Valid @RequestBody Divisor divisor){
QueryWrapper<Divisor> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("mac", divisor.getMac()).eq("is_del", Constants.NOT_DELETE);
+ queryWrapper.eq("organization_id", divisor.getOrganizationId()).eq("is_del", Constants.NOT_DELETE);
if (divisorService.getOne(queryWrapper) != null) {
return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
}
@@ -64,7 +63,7 @@
public ResultMessage update(@Valid @RequestBody Divisor divisor){
QueryWrapper<Divisor> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("mac", divisor.getMac()).eq("is_del", Constants.NOT_DELETE);
+ queryWrapper.eq("organization_id", divisor.getOrganizationId()).eq("is_del", Constants.NOT_DELETE);
if (divisorService.getOne(queryWrapper) != null) {
return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
}
@@ -75,11 +74,20 @@
@GetMapping("delete")
@ApiOperation("������")
public ResultMessage delete(@RequestParam @ApiParam(value = "id",name = "������id") Integer id){
- divisorMapper.deleteById(id);
+ divisorService.delete(id);
return ResultMessage.ok();
}
+
+ @GetMapping("select")
+ @ApiOperation("������")
+ public ResultMessage select(@RequestParam @ApiParam(value = "id",name = "������id") Integer id){
+ Divisor divisor = divisorService.queryById(id);
+ return ResultMessage.ok(ObjectUtils.isEmpty(divisor)?"0":divisor);
+ }
+
+
@GetMapping("page")
@ApiOperation("������")
public ResultMessage page(@RequestParam @ApiParam(value = "mac",name = "mac���") String mac,
--
Gitblit v1.8.0