From eb3fd00451b997118d731b65d249a74655303d6c Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Thu, 3 Aug 2023 19:05:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E7=8A=B6=E5=88=97=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E6=89=BE=E7=B1=BB=E5=9E=8B=20=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E6=8C=87=E4=BB=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DyLevelController.java | 5 +- .../controller/TermSetController.java | 14 ++++ .../shxy/xymanager_dao/dao/DyLevelDao.java | 4 +- .../impl/DyLevelServiceImpl.java | 81 ++++++++++++++++--- .../service/DyLevelService.java | 2 +- 5 files changed, 88 insertions(+), 18 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 6cb7ddf..cfcd7be 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 @@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.RequestBody; @@ -36,8 +37,8 @@ public class DyLevelController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getdyTreeList") @Log(title = "获取电压等级树状列表接口", type = "查询") - public ResponseReult getdyTreeList() { - ServiceBody serviceBody = dyLevelService.getdyTreeList(); + public ResponseReult getdyTreeList(@Param("type") Integer type) { + ServiceBody serviceBody = dyLevelService.getdyTreeList(type); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java index 2b3d932..562ead5 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java @@ -68,4 +68,18 @@ public class TermSetController extends BaseController { } } + + @ApiOperation(value = "设备控制接口", notes = "设备控制接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/setTermCamera") + @Log(title = "设备控制接口", type = "查询") + public ResponseReult setTermCamera(UpdateCameraVo vo) { + ServiceBody serviceBody = termSetService.updateTermCamera(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java index b62bd49..47ae45b 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java @@ -13,7 +13,7 @@ public interface DyLevelDao { List selectDyAndLineAndTowerAnTermList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid, @Param("termid") Integer termid, @Param("search") String search, @Param("status") Integer status); - List selectDyAndLineAndTowerList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid,@Param("status") Integer status); + List selectDyAndLineAndTowerList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid, @Param("status") Integer status); int deleteByPrimaryKey(Integer id); @@ -25,7 +25,7 @@ public interface DyLevelDao { List selectAll(@Param("status") Integer status); - List selectTreeList(@Param("status") Integer status); + List selectTreeList( @Param("status") Integer status); List selectTreeListByChannelId(@Param("channelid") Integer channelid, @Param("status") Integer status); 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 1bd7b7f..e0160fd 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 @@ -27,6 +27,7 @@ import org.springframework.stereotype.Service; import java.math.BigInteger; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -55,7 +56,7 @@ public class DyLevelServiceImpl implements DyLevelService { * @return */ @Override - public ServiceBody getdyTreeList() { + public ServiceBody getdyTreeList(Integer type) { DyLineTreeListModel model = new DyLineTreeListModel(); List list = dyLevelDao.selectTreeList(CommonStatus.EFFECTIVE.value()); boolean empty = CollectionUtil.isEmpty(list); @@ -64,27 +65,81 @@ public class DyLevelServiceImpl implements DyLevelService { } else { int onlinenum = 0; int totalnum = 0; - List beans = BeanUtil.copyToList(list, DyLineTreeListModel.DyListBean.class, CopyOptions.create().ignoreCase()); - for (int i = 0; i < beans.size(); i++) { - 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++) { + ArrayList dyListBeans = new ArrayList<>(); + for (int i = 0; i < list.size(); i++) { + DyLineAndTerminalWithHeartDto dyDto = list.get(i); + List linelist = dyDto.getList(); + if (CollectionUtil.isEmpty(linelist)) { + continue; + } + DyLineTreeListModel.DyListBean dyModel = new DyLineTreeListModel.DyListBean(); + dyModel.setId(dyDto.getId()); + dyModel.setDyValue(dyDto.getDyValue()); + dyModel.setName(dyDto.getName()); + ArrayList lineBeans = new ArrayList<>(); + for (int j = 0; j < linelist.size(); j++) { + LineAndTerminalWithHeartDto lineDto = linelist.get(j); + List termlist = lineDto.getList(); + if (CollectionUtil.isEmpty(termlist)) { + continue; + } + DyLineTreeListModel.LineBean lineBean = new DyLineTreeListModel.LineBean(); + lineBean.setId(lineDto.getId()); + lineBean.setName(lineDto.getName()); + lineBean.setBsManufacturer(lineDto.getBsManufacturer()); + + ArrayList beanlist = new ArrayList<>(); + for (int k = 0; k < termlist.size(); k++){ totalnum++; - TerminalsWithHeart terminalsWithHeart = list.get(i).getList().get(j).getList().get(k); + TerminalsWithHeart terminalsWithHeart = termlist.get(k); + + DyLineTreeListModel.TerminalBean bean = new DyLineTreeListModel.TerminalBean(); + bean.setId(terminalsWithHeart.getId()); + bean.setAddress(terminalsWithHeart.getAddress()); + bean.setCmdid(terminalsWithHeart.getCmdid()); + bean.setDisplayname(terminalsWithHeart.getDisplayname()); + bean.setEquipname(terminalsWithHeart.getEquipname()); + bean.setModel(terminalsWithHeart.getModel()); + bean.setName(terminalsWithHeart.getName()); + bean.setProtocol(terminalsWithHeart.getProtocol()); + bean.setTowerid(terminalsWithHeart.getTowerid()); BigInteger lastheartbeat = terminalsWithHeart.getLastheartbeat(); boolean b = TerminalUtils.judgeTerminalStatus(lastheartbeat); - if (b) { - beans.get(i).getList().get(j).getList().get(k).setOnlinestatus(CommonStatus.EFFECTIVE.value()); - onlinenum++; - } else { - beans.get(i).getList().get(j).getList().get(k).setOnlinestatus(CommonStatus.DELETE.value()); + if (type == null || type.intValue() == -1) {//查询全部 + if (b) { + bean.setOnlinestatus(CommonStatus.EFFECTIVE.value()); + onlinenum++; + } else { + bean.setOnlinestatus(CommonStatus.DELETE.value()); + } + beanlist.add(bean); + } else if (type.intValue() == 0) { + if (b) { + onlinenum++; + bean.setOnlinestatus(CommonStatus.EFFECTIVE.value()); + } else { + bean.setOnlinestatus(CommonStatus.DELETE.value()); + beanlist.add(bean); + } + } else if (type.intValue() == 1) { + if (b) { + onlinenum++; + bean.setOnlinestatus(CommonStatus.EFFECTIVE.value()); + beanlist.add(bean); + } else { + bean.setOnlinestatus(CommonStatus.DELETE.value()); + } } } + lineBean.setList(beanlist); + lineBeans.add(lineBean); } + dyModel.setList(lineBeans); + dyListBeans.add(dyModel); } - model.setOnlineNum(onlinenum); model.setTotalNum(totalnum); - model.setList(beans); + model.setList(dyListBeans); } return Asserts.success(model); } 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 064e87c..fccc8b8 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 @@ -20,7 +20,7 @@ public interface DyLevelService { * * @return */ - ServiceBody getdyTreeList(); + ServiceBody getdyTreeList(Integer type); /**