From af18f17054b09655d170b01cffb44a1b3846371f Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 12 Nov 2024 11:38:23 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=94=B5=E5=8E=8B?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E7=9A=84add=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DyLevelController.java | 10 +++------- .../controller/LineController.java | 12 +++++------- .../src/main/resources/mappers/DyLevelDao.xml | 8 +++++--- .../src/main/resources/mappers/LinesDao.xml | 8 +++++--- .../impl/DyLevelServiceImpl.java | 7 ++++--- .../xymanager_service/impl/LineServiceImpl.java | 15 ++++++++------- .../xymanager_service/service/DyLevelService.java | 2 +- .../xymanager_service/service/LineService.java | 2 +- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java index 19531a2..d541f25 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java @@ -58,13 +58,9 @@ public class DyLevelController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/add") @Log(title = "增加电压", type = "查询") - public ResponseReult addDy(@RequestBody DyLevel vo) { - ServiceBody serviceBody = dyLevelService.add(vo); - if (serviceBody.getCode() == ServiceStatus.SUCCESS) { - return ResponseReult.success(serviceBody.getData()); - } else { - return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); - } + public ResponseReult addDy(@RequestBody DyLevel vo) { + dyLevelService.add(vo); + return ResponseReult.success(vo); } @ApiOperation(value = "删除电压", notes = "删除电压", httpMethod = "POST") diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java index 88a24e0..7945d3e 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java @@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Api(value = "线路接口", tags = "线路相关") @RestController @@ -48,13 +50,9 @@ public class LineController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/addLine") @Log(title = "添加线路", type = "新增") - public ResponseReult addLine(@RequestBody @Validated LineVo vo) { - ServiceBody serviceBody = lineService.addLine(vo); - if (serviceBody.getCode() == ServiceStatus.SUCCESS) { - return ResponseReult.success(serviceBody.getData()); - } else { - return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); - } + public ResponseReult> addLine(@RequestBody @Validated LineVo vo) { + List list = lineService.addLine(vo); + return ResponseReult.success(list); } @ApiOperation(value = "删除线路", notes = "删除线路接口", httpMethod = "POST") diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index ad9f5bf..1f65fc3 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -306,11 +306,13 @@ - - insert into dy_level (id, name, dy_value, + + SELECT LAST_INSERT_ID() + + insert into dy_level (name, dy_value, status, create_time, update_time ) - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{dyValue,jdbcType=INTEGER}, + values (#{name,jdbcType=VARCHAR}, #{dyValue,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} ) diff --git a/xymanager_dao/src/main/resources/mappers/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml index a11167e..d62e0cc 100644 --- a/xymanager_dao/src/main/resources/mappers/LinesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/LinesDao.xml @@ -167,11 +167,13 @@ - - insert into lines (id, name, bs_manufacturer, + + SELECT LAST_INSERT_ID() + + insert into lines (name, bs_manufacturer, dy_level_id, status, create_time, update_time) - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{bsManufacturer,jdbcType=VARCHAR}, + values (#{name,jdbcType=VARCHAR}, #{bsManufacturer,jdbcType=VARCHAR}, #{dyLevelId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java index e9a76d9..a18892c 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java @@ -310,10 +310,11 @@ public class DyLevelServiceImpl implements DyLevelService { } @Override - public ServiceBody add(DyLevel vo) { + public void add(DyLevel vo) { + vo.setStatus(1); vo.setCreateTime(new Date()); - dyLevelDao.insertSelective(vo); - return Asserts.success("success"); + vo.setUpdateTime(new Date()); + dyLevelDao.insert(vo); } @Override diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java index b01e38f..3351a85 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java @@ -209,16 +209,17 @@ public class LineServiceImpl implements LineService { */ @Override @CacheEvict(cacheNames = {"permissionfull", "permissionover", "fulltree"}, allEntries = true) - public ServiceBody addLine(LineVo vo) { + public List addLine(LineVo vo) { List lines = BeanUtil.copyToList(vo.getList(), Lines.class, CopyOptions.create().ignoreCase()); Date date = new Date(); - int i = linesDao.insertList(lines, CommonStatus.EFFECTIVE.value(), date, date); - if (i != 0) { - cacheService.updateLineMap(); - return Asserts.success("录入成功"); - } else { - return Asserts.error("录入失败"); + for (Lines line: lines){ + line.setStatus(1); + line.setCreateTime(date); + line.setUpdateTime(date); + linesDao.insert(line); } + cacheService.updateLineMap(); + return lines; } /** diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/DyLevelService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/DyLevelService.java index c90d34a..dde1bdc 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/DyLevelService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/DyLevelService.java @@ -49,7 +49,7 @@ public interface DyLevelService { */ ServiceBody getLastTowerList(String requestIp, LastTowerVo vo); - ServiceBody add(DyLevel vo); + void add(DyLevel vo); ServiceBody delete(LineIdVo vo); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LineService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LineService.java index 7f9166b..1477e74 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LineService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LineService.java @@ -32,7 +32,7 @@ public interface LineService { * * @return */ - ServiceBody addLine(LineVo vo); + List addLine(LineVo vo); /** * 删除线路