From 2d3f852c1911da31cac537b1564b04670568f8c4 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 6 Mar 2024 19:46:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E7=8A=B6=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 --- .../xymanager_common/entity/Terminals.java | 33 +- .../model/DyLineTreeListModel.java | 85 +-- .../xymanager_dao/dao/SysUserMapperDao.java | 19 - .../impl/DyLevelServiceImpl.java | 587 ++++++++++-------- .../impl/SysUserServiceImpl.java | 12 - 5 files changed, 350 insertions(+), 386 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java index e3c3bb6..430485c 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java @@ -1,9 +1,14 @@ package com.shxy.xymanager_common.entity; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; import com.fasterxml.jackson.annotation.JsonInclude; +import com.shxy.xymanager_common.enums.CommonStatus; +import com.shxy.xymanager_common.util.MyDateUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.beans.factory.annotation.Value; import java.io.Serializable; import java.math.BigInteger; @@ -14,17 +19,23 @@ import java.util.Date; @ApiModel(value = "装置", description = "装置") public class Terminals implements Serializable { + @Value("${heart.time}") + private static Integer hearttime; + @ApiModelProperty(value = "装置编号", example = "123456") private Integer id; private Integer lineid; + @ApiModelProperty(value = "杆塔编号", example = "123456") private Integer towerid; + @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") private String cmdid; private Short orgId; + @ApiModelProperty(value = "装置名称", example = "名称名称") private String equipName; private String displayName; @@ -33,8 +44,6 @@ public class Terminals implements Serializable { private String essentialInfoVersion; - private Integer hasPan; - private String bsManufacturer; private String sim; @@ -55,8 +64,26 @@ public class Terminals implements Serializable { private BigInteger lastheartbeat; + @ApiModelProperty(value = "在线状态", example = "0--掉线1--在线") private Integer onlinestatus; + public Integer getOnlinestatus() { + if (lastheartbeat == null) { + return CommonStatus.DELETE.value(); + } + long time = MyDateUtils.TimeSecond2MillSecond(lastheartbeat.longValue()); + DateTime date = MyDateUtils.date(time); + long between = MyDateUtils.between(MyDateUtils.getNowDate(), date, DateUnit.MINUTE); + if (between > hearttime) { + return CommonStatus.DELETE.value(); + } else { + return CommonStatus.EFFECTIVE.value(); + } + } + + @ApiModelProperty(value = "是否带云台", example = "0-否 1-是") + private Integer hasPan; + private Integer netType; private Integer status; @@ -72,6 +99,8 @@ public class Terminals implements Serializable { return cmdid; } + + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java index 6cf2197..ad9560d 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java @@ -1,5 +1,7 @@ package com.shxy.xymanager_common.model; +import com.shxy.xymanager_common.entity.DyLevel; +import com.shxy.xymanager_common.entity.Terminals; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,87 +23,8 @@ public class DyLineTreeListModel implements Serializable { private Integer onlineNum; @ApiModelProperty(value = "电压列表", example = "[]") - private List list; + private List list; @ApiModelProperty(value = "收藏列表", example = "[]") - private List favorlist; - - @Data - public static class DyListBean { - @ApiModelProperty(value = "电压编号", example = "123456") - private Integer id; - - @ApiModelProperty(value = "电压名称", example = "AAAA") - private String name; - - @ApiModelProperty(value = "电压大小", example = "AAAA") - private Integer dyValue; - - @ApiModelProperty(value = "线路列表", example = "[]") - private List list; - } - - @Data - public static class LineBean { - - @ApiModelProperty(value = "线路编号", example = "123456") - private Integer id; - - @ApiModelProperty(value = "线路名称", example = "AAAA") - private String name; - - @ApiModelProperty(value = "单位", example = "123456") - private String bsManufacturer; - - @ApiModelProperty(value = "装置信息", example = "123456") - private List list; - - } - - @Data - public static class TerminalBean { - - @ApiModelProperty(value = "装置编号", example = "123456") - private Integer id; - - @ApiModelProperty(value = "杆塔编号", example = "123456") - private Integer towerid; - - @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") - private String cmdid; - - @ApiModelProperty(value = "装置名称", example = "名称名称") - private String equipname; - - @ApiModelProperty(value = "杆塔显示名", example = "名称名称") - private String name; - - @ApiModelProperty(value = "杆塔地址", example = "名称名称") - private String address; - - @ApiModelProperty(value = "规约", example = "规约") - private Integer protocol; - - @ApiModelProperty(value = "装置显示名", example = "名称名称") - private String displayname; - - @ApiModelProperty(value = "装置型号", example = "型号型号") - private String model; - - @ApiModelProperty(value = "在线状态", example = "0--掉线1--在线") - private Integer onlinestatus; - - @ApiModelProperty(value = "是否带云台", example = "0-否 1-是") - private Integer hasPan; - - @ApiModelProperty(value = "相位", example = "0-否 1-是") - private String phase; - - @ApiModelProperty(value = "装置类型", example = "0-否 1-是") - private String equipmentType; - - @ApiModelProperty(value = "是否收藏", example = "0--未收藏 1--已收藏") - private Integer isfavor; - - } + private List favorlist; } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java index bbefc64..04ad6b5 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java @@ -62,15 +62,6 @@ public interface SysUserMapperDao { public SysUser selectUserById(Long userId); - /** - * 修改用户头像 - * - * @param userName 用户名 - * @param avatar 头像地址 - * @return 结果 - */ - int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); - /** * 重置用户密码 * @@ -80,16 +71,6 @@ public interface SysUserMapperDao { */ int resetUserPwd(@Param("userName") String userName, @Param("password") String password); - - /** - * 批量删除用户信息 - * - * @param userIds 需要删除的用户ID - * @return 结果 - */ - public int deleteUserByIds(Long[] userIds); - - int deleteUserById(String userId); 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 dd5b1aa..8b36c57 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,8 +27,10 @@ import org.springframework.stereotype.Service; import java.math.BigInteger; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; /** * 装置通道实现层 @@ -97,7 +99,7 @@ public class DyLevelServiceImpl implements DyLevelService { Asserts.fail("权限解析错误"); e.printStackTrace(); } - ArrayList favorList = new ArrayList<>(); + ArrayList favorList = new ArrayList<>(); ArrayList favoridlist = new ArrayList<>(); List terminalFavs = terminalFavsDao.selectByUid(uid); if (CollectionUtil.isNotEmpty(terminalFavs)) { @@ -108,312 +110,353 @@ public class DyLevelServiceImpl implements DyLevelService { List dypList = permissionDetail.getDypList(); List linepList = permissionDetail.getLinepList(); List towerpList = permissionDetail.getTowerpList(); + List termpList = permissionDetail.getTermpList(); Integer aSuper = permissionDetail.getIsSuper(); - List list = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(dypList) || CollectionUtil.isNotEmpty(linepList) || CollectionUtil.isNotEmpty(towerpList) || aSuper.intValue()==1) { - list = dyLevelDao.selectTreeList(CommonStatus.EFFECTIVE.value(), dypList, linepList, towerpList,aSuper); + + DyLevelExample example = new DyLevelExample(); + DyLevelExample.Criteria criteria = example.createCriteria().andStatusEqualTo(CommonStatus.EFFECTIVE.value()); + if (CollectionUtil.isNotEmpty(dypList) && aSuper.equals(CommonStatus.DELETE.value())) { + criteria.andIdIn(dypList); + } + List dyLevels = dyLevelDao.selectByExample(example); + + LinesExample example1 = new LinesExample(); + LinesExample.Criteria criteria1 = example1.createCriteria().andStatusEqualTo(CommonStatus.EFFECTIVE.value()).andDyLevelIdIsNotNull(); + if (CollectionUtil.isNotEmpty(linepList) || aSuper.equals(CommonStatus.DELETE.value())) { + criteria1.andIdIn(linepList); + } + List lines = linesDao.selectByExample(example1); + + TowersExample example2 = new TowersExample(); + TowersExample.Criteria criteria2 = example2.createCriteria().andStatusEqualTo(CommonStatus.EFFECTIVE.value()).andLineIdIsNotNull(); + if (CollectionUtil.isNotEmpty(towerpList) || aSuper.equals(CommonStatus.DELETE.value())) { + criteria2.andIdIn(towerpList); } - boolean empty = CollectionUtil.isEmpty(list); - if (empty) { - model.setList(new ArrayList<>()); - } else { - int onlinenum = 0; - int totalnum = 0; - 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; + List towers = towerDao.selectByExample(example2); + + TerminalsExample example3 = new TerminalsExample(); + TerminalsExample.Criteria criteria3 = example3.createCriteria().andStatusEqualTo(CommonStatus.EFFECTIVE.value()).andTowerIdIsNotNull(); + if (CollectionUtil.isNotEmpty(termpList) || aSuper.equals(CommonStatus.DELETE.value())) { + criteria3.andIdIn(termpList); + } + List terminals = terminalsDao.selectByExample(example3); + + TerminalStatusExample example4 = new TerminalStatusExample(); + if (CollectionUtil.isNotEmpty(termpList) || aSuper.equals(CommonStatus.EFFECTIVE.value())) { + example4.createCriteria().andTermIdIn(termpList); + } + List terminalStatuses = terminalStatusDao.selectByExample(example4); + + + AtomicInteger onlinenum = new AtomicInteger(); + AtomicInteger totalnum = new AtomicInteger(); + if (CollectionUtil.isNotEmpty(dyLevels)) { + HashMap dymap = new HashMap<>(); + HashMap linemap = new HashMap<>(); + HashMap towermap = new HashMap<>(); + HashMap termmap = new HashMap<>(); + HashMap tsmap = new HashMap<>(); + for (DyLevel ditem : dyLevels) { + dymap.put(ditem.getId(), ditem); + } + for (Lines litem : lines) { + Integer dyLevelId = litem.getDyLevelId(); + if (dyLevelId != null) { + if (dymap.get(dyLevelId) != null) { + linemap.put(litem.getId(), litem); + } } - 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; + } + for (Towers titem : towers) { + Integer lineId = titem.getLineId(); + if (lineId != null) { + if (linemap.get(lineId) != null) { + towermap.put(titem.getId(), titem); } - 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 = termlist.get(k); - - DyLineTreeListModel.TerminalBean bean = new DyLineTreeListModel.TerminalBean(); - Integer id = terminalsWithHeart.getId(); - bean.setId(id); - 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()); - bean.setHasPan(terminalsWithHeart.getHasPan()); - bean.setPhase(terminalsWithHeart.getPhase()); - bean.setEquipmentType(terminalsWithHeart.getEquipmentType()); -// Integer isfavor = terminalsWithHeart.getIsfavor(); - boolean contains = favoridlist.contains(id); - if (contains) { - bean.setIsfavor(CommonStatus.EFFECTIVE.value()); - } else { - bean.setIsfavor(CommonStatus.DELETE.value()); - } - - BigInteger lastheartbeat = terminalsWithHeart.getLastheartbeat(); - boolean b = TerminalUtils.judgeTerminalStatus(lastheartbeat); - 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()); - } - } -// if (isfavor!=null && isfavor.intValue() == CommonStatus.EFFECTIVE.value()) { - if (contains) { - favorList.add(bean); - } + } + } + for (Terminals termitem : terminals) { + Integer towerid = termitem.getTowerid(); + if (towerid != null) { + if (towermap.get(towerid) != null) { + termmap.put(termitem.getId(), termitem); } - lineBean.setList(beanlist); - lineBeans.add(lineBean); } - dyModel.setList(lineBeans); - dyListBeans.add(dyModel); } - model.setOnlineNum(onlinenum); - model.setTotalNum(totalnum); - model.setList(dyListBeans); - model.setFavorlist(favorList); - } - return Asserts.success(model); - } + for (TerminalStatus tsitem : terminalStatuses) { + tsmap.put(tsitem.getTermId(), tsitem); + } - @Override - public ServiceBody getzzdyTreeList(Integer type, List idlist) { - DyLineTreeListModel model = new DyLineTreeListModel(); - ArrayList favorList = new ArrayList<>(); - List list = dyLevelDao.selectListTreeList(CommonStatus.EFFECTIVE.value(), idlist); - boolean empty = CollectionUtil.isEmpty(list); - if (empty) { - model.setList(new ArrayList<>()); - } else { - int onlinenum = 0; - int totalnum = 0; - 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; + + linemap.forEach((key, value) -> { + Integer dyLevelId = value.getDyLevelId(); + if (dyLevelId != null) { + DyLevel dyLevel = dymap.get(dyLevelId); + if (BeanUtil.isNotEmpty(dyLevel)) { + dyLevel.getList().add(value); + } + } + }); + + towermap.forEach((key, value) -> { + Integer lineId = value.getLineId(); + if (lineId != null) { + Lines lines1 = linemap.get(lineId); + if (BeanUtil.isNotEmpty(lines1)) { + lines1.getList().add(value); + } } - 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; + }); + + termmap.forEach((key, value) -> { + Integer towerid = value.getTowerid(); + Towers towers1 = towermap.get(towerid); + if (BeanUtil.isNotEmpty(towers1)) { + Integer id = value.getId(); + TerminalStatus terminalStatus = tsmap.get(id); + value.setLastheartbeat(terminalStatus.getLastHeartbeat()); + boolean contains = favoridlist.contains(id); + if (contains) { + favorList.add(value); } - 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 = 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()); - bean.setHasPan(terminalsWithHeart.getHasPan()); - bean.setPhase(terminalsWithHeart.getPhase()); - bean.setEquipmentType(terminalsWithHeart.getEquipmentType()); - Integer isfavor = terminalsWithHeart.getIsfavor(); - bean.setIsfavor(isfavor); - BigInteger lastheartbeat = terminalsWithHeart.getLastheartbeat(); - boolean b = TerminalUtils.judgeTerminalStatus(lastheartbeat); + + + if (towerid != null) { if (type == null || type.intValue() == -1) {//查询全部 - if (b) { - bean.setOnlinestatus(CommonStatus.EFFECTIVE.value()); - onlinenum++; - } else { - bean.setOnlinestatus(CommonStatus.DELETE.value()); + + totalnum.getAndIncrement(); + Integer onlinestatus = value.getOnlinestatus(); + if (onlinestatus.equals(CommonStatus.EFFECTIVE.value())) { + onlinenum.getAndIncrement(); } - beanlist.add(bean); + towers1.getList().add(value); } else if (type.intValue() == 0) { - if (b) { - onlinenum++; - bean.setOnlinestatus(CommonStatus.EFFECTIVE.value()); + + totalnum.getAndIncrement(); + Integer onlinestatus = value.getOnlinestatus(); + if (onlinestatus.equals(CommonStatus.EFFECTIVE.value())) { + onlinenum.getAndIncrement(); } else { - bean.setOnlinestatus(CommonStatus.DELETE.value()); - beanlist.add(bean); + + towers1.getList().add(value); } } else if (type.intValue() == 1) { - if (b) { - onlinenum++; - bean.setOnlinestatus(CommonStatus.EFFECTIVE.value()); - beanlist.add(bean); - } else { - bean.setOnlinestatus(CommonStatus.DELETE.value()); + + totalnum.getAndIncrement(); + Integer onlinestatus = value.getOnlinestatus(); + if (onlinestatus.equals(CommonStatus.EFFECTIVE.value())) { + onlinenum.getAndIncrement(); + towers1.getList().add(value); } } - if (isfavor != null && isfavor.intValue() == CommonStatus.EFFECTIVE.value()) { - favorList.add(bean); - } } - lineBean.setList(beanlist); - lineBeans.add(lineBean); } - dyModel.setList(lineBeans); - dyListBeans.add(dyModel); - } - model.setOnlineNum(onlinenum); - model.setTotalNum(totalnum); - model.setList(dyListBeans); + }); + model.setOnlineNum(onlinenum.get()); + model.setTotalNum(totalnum.get()); model.setFavorlist(favorList); } - return Asserts.success(model); + return Asserts.success(model); } - - /** - * 获取电压等级列表 - * - * @return - */ - @Override - public ServiceBody getdyList() { - DyListModel model = new DyListModel(); - List list = dyLevelDao.selectAll(CommonStatus.EFFECTIVE.value()); - boolean empty = CollectionUtil.isEmpty(list); - if (empty) { - model.setList(new ArrayList<>()); - } else { - List models = BeanUtil.copyToList(list, DyListModel.DyBean.class); - model.setList(models); + @Override + public ServiceBody getzzdyTreeList (Integer type, List idlist){ + DyLineTreeListModel model = new DyLineTreeListModel(); +// ArrayList favorList = new ArrayList<>(); +// List list = dyLevelDao.selectListTreeList(CommonStatus.EFFECTIVE.value(), idlist); +// boolean empty = CollectionUtil.isEmpty(list); +// if (empty) { +// model.setList(new ArrayList<>()); +// } else { +// int onlinenum = 0; +// int totalnum = 0; +// 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 = 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()); +// bean.setHasPan(terminalsWithHeart.getHasPan()); +// bean.setPhase(terminalsWithHeart.getPhase()); +// bean.setEquipmentType(terminalsWithHeart.getEquipmentType()); +// Integer isfavor = terminalsWithHeart.getIsfavor(); +// bean.setIsfavor(isfavor); +// BigInteger lastheartbeat = terminalsWithHeart.getLastheartbeat(); +// boolean b = TerminalUtils.judgeTerminalStatus(lastheartbeat); +// 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()); +// } +// } +// if (isfavor != null && isfavor.intValue() == CommonStatus.EFFECTIVE.value()) { +// favorList.add(bean); +// } +// } +// lineBean.setList(beanlist); +// lineBeans.add(lineBean); +// } +// dyModel.setList(lineBeans); +// dyListBeans.add(dyModel); +// } +// model.setOnlineNum(onlinenum); +// model.setTotalNum(totalnum); +// model.setList(dyListBeans); +// model.setFavorlist(favorList); +// } + return Asserts.success(model); } - return Asserts.success(model); - } - /** - * 根据电压或者线路获取所有杆塔和最新照片 - * - * @param vo - * @return - */ - @Override - public ServiceBody getLastTowerList(String requestIp, LastTowerVo vo) { - TerminalPhotosModel model = new TerminalPhotosModel(); - Integer id = vo.getId(); - Integer type = vo.getType(); - int pageindex = vo.getPageindex(); - int pagesize = vo.getPagesize(); - List dtos = new ArrayList<>(); - if (type == 1) { - dtos = dyLevelDao.selectDyAndLineAndTowerList(id, null, null, CommonStatus.EFFECTIVE.value()); - } else { - dtos = dyLevelDao.selectDyAndLineAndTowerList(null, id, null, CommonStatus.EFFECTIVE.value()); - } - if (CollectionUtil.isEmpty(dtos)) { - model.setList(new ArrayList<>()); - } else { - ArrayList towerlist = new ArrayList<>(); - for (DyLineAndTowertDto item : dtos) { - Integer towerId = item.getTowerId(); - towerlist.add(towerId); + /** + * 获取电压等级列表 + * + * @return + */ + @Override + public ServiceBody getdyList () { + DyListModel model = new DyListModel(); + List list = dyLevelDao.selectAll(CommonStatus.EFFECTIVE.value()); + boolean empty = CollectionUtil.isEmpty(list); + if (empty) { + model.setList(new ArrayList<>()); + } else { + List models = BeanUtil.copyToList(list, DyListModel.DyBean.class); + model.setList(models); } + return Asserts.success(model); + } - if (CollectionUtil.isEmpty(towerlist)) { + /** + * 根据电压或者线路获取所有杆塔和最新照片 + * + * @param vo + * @return + */ + @Override + public ServiceBody getLastTowerList (String requestIp, LastTowerVo vo){ + TerminalPhotosModel model = new TerminalPhotosModel(); + Integer id = vo.getId(); + Integer type = vo.getType(); + int pageindex = vo.getPageindex(); + int pagesize = vo.getPagesize(); + List dtos = new ArrayList<>(); + if (type == 1) { + dtos = dyLevelDao.selectDyAndLineAndTowerList(id, null, null, CommonStatus.EFFECTIVE.value()); + } else { + dtos = dyLevelDao.selectDyAndLineAndTowerList(null, id, null, CommonStatus.EFFECTIVE.value()); + } + if (CollectionUtil.isEmpty(dtos)) { model.setList(new ArrayList<>()); } else { - PageUtils.SetPage(pageindex, pagesize); - List list = terminalChannelMapperDao.selectTermAndMapByTowerId(CommonStatus.EFFECTIVE.value(), towerlist); - List beans = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(list)) { - ArrayList photolist = new ArrayList<>(); - for (TerminalChannelMapper item : list) { - photolist.add(item.getPhotoId()); - } - Map lineMap = cacheService.getLineMap(); - Map termchannelMapMap = cacheService.getTermChannelMapMap(); - Map terminalMap = cacheService.getTerminalMap(); - Map termchannelMap = cacheService.getTermChannelMap(); - Map towerMap = cacheService.getTowerMap(); - List photoList = terminalPhotoDao.selectPhotosByIdList(photolist); - - List imgarlarmsList = new ArrayList<>(); - List idlist = new ArrayList<>(); - for (TerminalPhoto tp : photoList) { - if (tp.getOrginalId() != null) { - idlist.add(tp.getOrginalId()); + ArrayList towerlist = new ArrayList<>(); + for (DyLineAndTowertDto item : dtos) { + Integer towerId = item.getTowerId(); + towerlist.add(towerId); + } + + if (CollectionUtil.isEmpty(towerlist)) { + model.setList(new ArrayList<>()); + } else { + PageUtils.SetPage(pageindex, pagesize); + List list = terminalChannelMapperDao.selectTermAndMapByTowerId(CommonStatus.EFFECTIVE.value(), towerlist); + List beans = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(list)) { + ArrayList photolist = new ArrayList<>(); + for (TerminalChannelMapper item : list) { + photolist.add(item.getPhotoId()); + } + Map lineMap = cacheService.getLineMap(); + Map termchannelMapMap = cacheService.getTermChannelMapMap(); + Map terminalMap = cacheService.getTerminalMap(); + Map termchannelMap = cacheService.getTermChannelMap(); + Map towerMap = cacheService.getTowerMap(); + List photoList = terminalPhotoDao.selectPhotosByIdList(photolist); + + List imgarlarmsList = new ArrayList<>(); + List idlist = new ArrayList<>(); + for (TerminalPhoto tp : photoList) { + if (tp.getOrginalId() != null) { + idlist.add(tp.getOrginalId()); + } + } + if (idlist.size() > 0) { + List labellist = new ArrayList<>(); + Map alarmParamMap = cacheService.getAlarmParamMap(); + alarmParamMap.forEach((key, value) -> { + labellist.add(value); + }); + imgarlarmsList = terminalImgAlarmsDao.selectAlarmsByTermidAndPhotoId(photoList, labellist); } - } - if (idlist.size() > 0) { - List labellist = new ArrayList<>(); - Map alarmParamMap = cacheService.getAlarmParamMap(); - alarmParamMap.forEach((key, value) -> { - labellist.add(value); - }); - imgarlarmsList = terminalImgAlarmsDao.selectAlarmsByTermidAndPhotoId(photoList, labellist); - } - beans = TerminalUtils.setTowerPhotoList(requestIp, list, lineMap, termchannelMapMap, terminalMap, termchannelMap, towerMap, photoList, imgarlarmsList); + beans = TerminalUtils.setTowerPhotoList(requestIp, list, lineMap, termchannelMapMap, terminalMap, termchannelMap, towerMap, photoList, imgarlarmsList); + } + model.setList(beans); + PageInfo pageData = PageUtils.getPageData(list); + int currentpage = pageData.getPageNum(); + model.setCurrentpage(currentpage); + long total = pageData.getTotal(); + model.setTotal(total); + + int pageSize = pageData.getPageSize(); + model.setPagesize(pageSize); + int pages = pageData.getPages(); + model.setTotalpage(pages); } - model.setList(beans); - PageInfo pageData = PageUtils.getPageData(list); - int currentpage = pageData.getPageNum(); - model.setCurrentpage(currentpage); - long total = pageData.getTotal(); - model.setTotal(total); - - int pageSize = pageData.getPageSize(); - model.setPagesize(pageSize); - int pages = pageData.getPages(); - model.setTotalpage(pages); } + + return Asserts.success(model); } - return Asserts.success(model); } - -} diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java index 76a96f4..6f94109 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java @@ -124,8 +124,6 @@ public class SysUserServiceImpl implements SysUserService { return Asserts.success("修改成功"); } return Asserts.error("修改失败"); - - } @Override @@ -159,7 +157,6 @@ public class SysUserServiceImpl implements SysUserService { return Asserts.error("失败"); } - @Override public SysUserSession selectUserById(String sessionId) { SysUserSession session = sysUserMapperDao.selectUserBySessionId(sessionId); @@ -185,15 +182,6 @@ public class SysUserServiceImpl implements SysUserService { model.setList(new ArrayList<>()); } else { List beans = BeanUtil.copyToList(list,SysUserModel.SysUserBean.class, CopyOptions.create().ignoreCase()); - -// BeanUtil.copyToList() -// List beans = Lists.newArrayList(); -// list.forEach(var->{ -// SysUserModel.SysUserBean bean = new SysUserModel.SysUserBean(); -// BeanUtils.copyProperties(var,bean); -// bean.setCreateTime(var.getCreateTime()); -// beans.add(bean); -// }); model.setList(beans); } PageInfo pageData = PageUtils.getPageData(list);