From 77fb89f7a4475c7dfef0b9b5567d88b0471e44b2 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 10 May 2023 14:04:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BA=BF=E8=B7=AF=E5=92=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A3=85=E7=BD=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LineController.java | 7 +++--- .../src/main/resources/mappers/LinesDao.xml | 5 ++++- .../impl/DyLevelServiceImpl.java | 22 ++++++++++++------- .../impl/LineServiceImpl.java | 2 +- .../service/LineService.java | 3 ++- 5 files changed, 24 insertions(+), 15 deletions(-) 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 7576234..f5e6d33 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 @@ -83,11 +83,11 @@ public class LineController extends BaseController { } } - @ApiOperation(value = "线路杆塔通道查询", notes = "线路杆塔通道查询", httpMethod = "POST") + @ApiOperation(value = "电压线路杆塔通道查询", notes = "电压线路杆塔通道查询查询", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getLineAndGt") - @Log(title = "线路杆塔通道查询", type = "查询") - public ResponseReult getLineAndGt(@RequestBody @Validated LineAndGtAndChannelVo vo) { + @Log(title = "电压线路杆塔通道查询", type = "查询") + public ResponseReult getDyLineAndGt(@RequestBody @Validated LineAndGtAndChannelVo vo) { ServiceBody serviceBody = lineService.getLineAndGt(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); @@ -95,5 +95,4 @@ public class LineController extends BaseController { return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); } } - } diff --git a/xymanager_dao/src/main/resources/mappers/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml index 48d2588..f66fd93 100644 --- a/xymanager_dao/src/main/resources/mappers/LinesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/LinesDao.xml @@ -47,7 +47,10 @@ select from `lines` - where dy_level_id = #{dyid} and status = #{status} + where status = #{status} + + and dy_level_id = #{dyid} + 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 cb428c9..7296cc3 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 @@ -8,6 +8,7 @@ import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.dto.DyLineAndTerminalDto; import com.shxy.xymanager_common.entity.DyLevel; import com.shxy.xymanager_common.entity.Lines; +import com.shxy.xymanager_common.entity.Terminals; import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.DyLineTreeListModel; @@ -52,14 +53,19 @@ public class DyLevelServiceImpl implements DyLevelService { for (int j = 0; j < beans.get(i).getList().size(); j++) { for (int k = 0; k < beans.get(i).getList().get(j).getList().size(); k++) { beans.get(i).getList().get(j).getList().get(k).setName(list.get(i).getList().get(j).getList().get(k).getDisplayName()); - Long lastheartbeat = list.get(i).getList().get(j).getList().get(k).getLastheartbeat(); - BigInteger time = MyDateUtils.TimeSecond2MillSecond(lastheartbeat); - DateTime date = MyDateUtils.date(time.longValue()); - long between = MyDateUtils.between(MyDateUtils.getNowDate(), date, DateUnit.MINUTE); - if (between > 30) { - beans.get(i).getList().get(j).getList().get(k).setOnlinestatus(CommonStatus.DELETE.value()); - } else { - beans.get(i).getList().get(j).getList().get(k).setOnlinestatus(CommonStatus.EFFECTIVE.value()); + Terminals terminals = list.get(i).getList().get(j).getList().get(k); + if (!BeanUtil.isEmpty(terminals)) { + Long lastheartbeat = terminals.getLastheartbeat(); + if (!BeanUtil.isEmpty(lastheartbeat)) { + BigInteger time = MyDateUtils.TimeSecond2MillSecond(lastheartbeat); + DateTime date = MyDateUtils.date(time.longValue()); + long between = MyDateUtils.between(MyDateUtils.getNowDate(), date, DateUnit.MINUTE); + if (between > 30) { + beans.get(i).getList().get(j).getList().get(k).setOnlinestatus(CommonStatus.DELETE.value()); + } else { + beans.get(i).getList().get(j).getList().get(k).setOnlinestatus(CommonStatus.EFFECTIVE.value()); + } + } } } } 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 70109eb..551726d 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 @@ -140,7 +140,7 @@ public class LineServiceImpl implements LineService { } /** - * 线路杆塔通道查询 + * 电压线路杆塔 * * @param vo * @return 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 aa9e34b..bccbe45 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 @@ -44,10 +44,11 @@ public interface LineService { ServiceBody updateLine(UpdateLineVo vo); /** - * 线路杆塔通道查询 + * 电压线路杆塔通道查询 * * @param vo * @return */ ServiceBody getLineAndGt(LineAndGtAndChannelVo vo); + }