xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

树状接口修改

Browse Source
dev
liuguijing 1 year ago
parent 118766228b
commit 2d3f852c19
5 changed files with 350 additions and 386 deletions
Show Stats Download Patch File Download Diff File

33
xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java
Unescape Escape View File

@ -1,9 +1,14 @@
package com.shxy.xymanager_common.entity; 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.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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigInteger; import java.math.BigInteger;
@ -14,17 +19,23 @@ import java.util.Date;
@ApiModel(value = "装置", description = "装置") @ApiModel(value = "装置", description = "装置")
public class Terminals implements Serializable { public class Terminals implements Serializable {
@Value("${heart.time}")
private static Integer hearttime;
@ApiModelProperty(value = "装置编号", example = "123456") @ApiModelProperty(value = "装置编号", example = "123456")
private Integer id; private Integer id;
private Integer lineid; private Integer lineid;
@ApiModelProperty(value = "杆塔编号", example = "123456")
private Integer towerid; private Integer towerid;
@ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678")
private String cmdid; private String cmdid;
private Short orgId; private Short orgId;
@ApiModelProperty(value = "装置名称", example = "名称名称")
private String equipName; private String equipName;
private String displayName; private String displayName;
@ -33,8 +44,6 @@ public class Terminals implements Serializable {
private String essentialInfoVersion; private String essentialInfoVersion;
private Integer hasPan;
private String bsManufacturer; private String bsManufacturer;
private String sim; private String sim;
@ -55,8 +64,26 @@ public class Terminals implements Serializable {
private BigInteger lastheartbeat; private BigInteger lastheartbeat;
@ApiModelProperty(value = "在线状态", example = "0--掉线1--在线")
private Integer onlinestatus; 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 netType;
private Integer status; private Integer status;
@ -72,6 +99,8 @@ public class Terminals implements Serializable {
return cmdid; return cmdid;
} }
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }

85
xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java
Unescape Escape View File

@ -1,5 +1,7 @@
package com.shxy.xymanager_common.model; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -21,87 +23,8 @@ public class DyLineTreeListModel implements Serializable {
private Integer onlineNum; private Integer onlineNum;
@ApiModelProperty(value = "电压列表", example = "[]") @ApiModelProperty(value = "电压列表", example = "[]")
private List<DyListBean> list; private List<DyLevel> list;
@ApiModelProperty(value = "收藏列表", example = "[]") @ApiModelProperty(value = "收藏列表", example = "[]")
private List<TerminalBean> favorlist; private List<Terminals> 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<LineBean> 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<TerminalBean> 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;
}
} }

19
xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java
Unescape Escape View File

@ -62,15 +62,6 @@ public interface SysUserMapperDao {
public SysUser selectUserById(Long userId); 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); int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
/**
* 批量删除用户信息
*
* @param userIds 需要删除的用户ID
* @return 结果
*/
public int deleteUserByIds(Long[] userIds);
int deleteUserById(String userId); int deleteUserById(String userId);

587
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java
Unescape Escape View File

@ -27,8 +27,10 @@ import org.springframework.stereotype.Service;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
/** /**
* 装置通道实现层 * 装置通道实现层
@ -97,7 +99,7 @@ public class DyLevelServiceImpl implements DyLevelService {
Asserts.fail("权限解析错误"); Asserts.fail("权限解析错误");
e.printStackTrace(); e.printStackTrace();
} }
ArrayList<DyLineTreeListModel.TerminalBean> favorList = new ArrayList<>(); ArrayList<Terminals> favorList = new ArrayList<>();
ArrayList<Integer> favoridlist = new ArrayList<>(); ArrayList<Integer> favoridlist = new ArrayList<>();
List<TerminalFavs> terminalFavs = terminalFavsDao.selectByUid(uid); List<TerminalFavs> terminalFavs = terminalFavsDao.selectByUid(uid);
if (CollectionUtil.isNotEmpty(terminalFavs)) { if (CollectionUtil.isNotEmpty(terminalFavs)) {
@ -108,312 +110,353 @@ public class DyLevelServiceImpl implements DyLevelService {
List<Integer> dypList = permissionDetail.getDypList(); List<Integer> dypList = permissionDetail.getDypList();
List<Integer> linepList = permissionDetail.getLinepList(); List<Integer> linepList = permissionDetail.getLinepList();
List<Integer> towerpList = permissionDetail.getTowerpList(); List<Integer> towerpList = permissionDetail.getTowerpList();
List<Integer> termpList = permissionDetail.getTermpList();
Integer aSuper = permissionDetail.getIsSuper(); Integer aSuper = permissionDetail.getIsSuper();
List<DyLineAndTerminalWithHeartDto> list = new ArrayList<>();
if (CollectionUtil.isNotEmpty(dypList) || CollectionUtil.isNotEmpty(linepList) || CollectionUtil.isNotEmpty(towerpList) || aSuper.intValue()==1) { DyLevelExample example = new DyLevelExample();
list = dyLevelDao.selectTreeList(CommonStatus.EFFECTIVE.value(), dypList, linepList, towerpList,aSuper); DyLevelExample.Criteria criteria = example.createCriteria().andStatusEqualTo(CommonStatus.EFFECTIVE.value());
if (CollectionUtil.isNotEmpty(dypList) && aSuper.equals(CommonStatus.DELETE.value())) {
criteria.andIdIn(dypList);
}
List<DyLevel> 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> 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); List<Towers> towers = towerDao.selectByExample(example2);
if (empty) {
model.setList(new ArrayList<>()); TerminalsExample example3 = new TerminalsExample();
} else { TerminalsExample.Criteria criteria3 = example3.createCriteria().andStatusEqualTo(CommonStatus.EFFECTIVE.value()).andTowerIdIsNotNull();
int onlinenum = 0; if (CollectionUtil.isNotEmpty(termpList) || aSuper.equals(CommonStatus.DELETE.value())) {
int totalnum = 0; criteria3.andIdIn(termpList);
ArrayList<DyLineTreeListModel.DyListBean> dyListBeans = new ArrayList<>(); }
for (int i = 0; i < list.size(); i++) { List<Terminals> terminals = terminalsDao.selectByExample(example3);
DyLineAndTerminalWithHeartDto dyDto = list.get(i);
List<LineAndTerminalWithHeartDto> linelist = dyDto.getList(); TerminalStatusExample example4 = new TerminalStatusExample();
if (CollectionUtil.isEmpty(linelist)) { if (CollectionUtil.isNotEmpty(termpList) || aSuper.equals(CommonStatus.EFFECTIVE.value())) {
continue; example4.createCriteria().andTermIdIn(termpList);
}
List<TerminalStatus> terminalStatuses = terminalStatusDao.selectByExample(example4);
AtomicInteger onlinenum = new AtomicInteger();
AtomicInteger totalnum = new AtomicInteger();
if (CollectionUtil.isNotEmpty(dyLevels)) {
HashMap<Integer, DyLevel> dymap = new HashMap<>();
HashMap<Integer, Lines> linemap = new HashMap<>();
HashMap<Integer, Towers> towermap = new HashMap<>();
HashMap<Integer, Terminals> termmap = new HashMap<>();
HashMap<Integer, TerminalStatus> 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()); for (Towers titem : towers) {
dyModel.setDyValue(dyDto.getDyValue()); Integer lineId = titem.getLineId();
dyModel.setName(dyDto.getName()); if (lineId != null) {
ArrayList<DyLineTreeListModel.LineBean> lineBeans = new ArrayList<>(); if (linemap.get(lineId) != null) {
for (int j = 0; j < linelist.size(); j++) { towermap.put(titem.getId(), titem);
LineAndTerminalWithHeartDto lineDto = linelist.get(j);
List<TerminalsWithHeart> termlist = lineDto.getList();
if (CollectionUtil.isEmpty(termlist)) {
continue;
} }
DyLineTreeListModel.LineBean lineBean = new DyLineTreeListModel.LineBean(); }
lineBean.setId(lineDto.getId()); }
lineBean.setName(lineDto.getName()); for (Terminals termitem : terminals) {
lineBean.setBsManufacturer(lineDto.getBsManufacturer()); Integer towerid = termitem.getTowerid();
if (towerid != null) {
ArrayList<DyLineTreeListModel.TerminalBean> beanlist = new ArrayList<>(); if (towermap.get(towerid) != null) {
for (int k = 0; k < termlist.size(); k++) { termmap.put(termitem.getId(), termitem);
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);
}
} }
lineBean.setList(beanlist);
lineBeans.add(lineBean);
} }
dyModel.setList(lineBeans);
dyListBeans.add(dyModel);
} }
model.setOnlineNum(onlinenum); for (TerminalStatus tsitem : terminalStatuses) {
model.setTotalNum(totalnum); tsmap.put(tsitem.getTermId(), tsitem);
model.setList(dyListBeans); }
model.setFavorlist(favorList);
}
return Asserts.success(model);
}
@Override
public ServiceBody<DyLineTreeListModel> getzzdyTreeList(Integer type, List<Integer> idlist) { linemap.forEach((key, value) -> {
DyLineTreeListModel model = new DyLineTreeListModel(); Integer dyLevelId = value.getDyLevelId();
ArrayList<DyLineTreeListModel.TerminalBean> favorList = new ArrayList<>(); if (dyLevelId != null) {
List<DyLineAndTerminalWithHeartDto> list = dyLevelDao.selectListTreeList(CommonStatus.EFFECTIVE.value(), idlist); DyLevel dyLevel = dymap.get(dyLevelId);
boolean empty = CollectionUtil.isEmpty(list); if (BeanUtil.isNotEmpty(dyLevel)) {
if (empty) { dyLevel.getList().add(value);
model.setList(new ArrayList<>()); }
} else { }
int onlinenum = 0; });
int totalnum = 0;
ArrayList<DyLineTreeListModel.DyListBean> dyListBeans = new ArrayList<>(); towermap.forEach((key, value) -> {
for (int i = 0; i < list.size(); i++) { Integer lineId = value.getLineId();
DyLineAndTerminalWithHeartDto dyDto = list.get(i); if (lineId != null) {
List<LineAndTerminalWithHeartDto> linelist = dyDto.getList(); Lines lines1 = linemap.get(lineId);
if (CollectionUtil.isEmpty(linelist)) { if (BeanUtil.isNotEmpty(lines1)) {
continue; lines1.getList().add(value);
}
} }
DyLineTreeListModel.DyListBean dyModel = new DyLineTreeListModel.DyListBean(); });
dyModel.setId(dyDto.getId());
dyModel.setDyValue(dyDto.getDyValue()); termmap.forEach((key, value) -> {
dyModel.setName(dyDto.getName()); Integer towerid = value.getTowerid();
ArrayList<DyLineTreeListModel.LineBean> lineBeans = new ArrayList<>(); Towers towers1 = towermap.get(towerid);
for (int j = 0; j < linelist.size(); j++) { if (BeanUtil.isNotEmpty(towers1)) {
LineAndTerminalWithHeartDto lineDto = linelist.get(j); Integer id = value.getId();
List<TerminalsWithHeart> termlist = lineDto.getList(); TerminalStatus terminalStatus = tsmap.get(id);
if (CollectionUtil.isEmpty(termlist)) { value.setLastheartbeat(terminalStatus.getLastHeartbeat());
continue; boolean contains = favoridlist.contains(id);
if (contains) {
favorList.add(value);
} }
DyLineTreeListModel.LineBean lineBean = new DyLineTreeListModel.LineBean();
lineBean.setId(lineDto.getId());
lineBean.setName(lineDto.getName()); if (towerid != null) {
lineBean.setBsManufacturer(lineDto.getBsManufacturer());
ArrayList<DyLineTreeListModel.TerminalBean> 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 (type == null || type.intValue() == -1) {//查询全部
if (b) {
bean.setOnlinestatus(CommonStatus.EFFECTIVE.value()); totalnum.getAndIncrement();
onlinenum++; Integer onlinestatus = value.getOnlinestatus();
} else { if (onlinestatus.equals(CommonStatus.EFFECTIVE.value())) {
bean.setOnlinestatus(CommonStatus.DELETE.value()); onlinenum.getAndIncrement();
} }
beanlist.add(bean); towers1.getList().add(value);
} else if (type.intValue() == 0) { } else if (type.intValue() == 0) {
if (b) {
onlinenum++; totalnum.getAndIncrement();
bean.setOnlinestatus(CommonStatus.EFFECTIVE.value()); Integer onlinestatus = value.getOnlinestatus();
if (onlinestatus.equals(CommonStatus.EFFECTIVE.value())) {
onlinenum.getAndIncrement();
} else { } else {
bean.setOnlinestatus(CommonStatus.DELETE.value());
beanlist.add(bean); towers1.getList().add(value);
} }
} else if (type.intValue() == 1) { } else if (type.intValue() == 1) {
if (b) {
onlinenum++; totalnum.getAndIncrement();
bean.setOnlinestatus(CommonStatus.EFFECTIVE.value()); Integer onlinestatus = value.getOnlinestatus();
beanlist.add(bean); if (onlinestatus.equals(CommonStatus.EFFECTIVE.value())) {
} else { onlinenum.getAndIncrement();
bean.setOnlinestatus(CommonStatus.DELETE.value()); 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.get());
} model.setTotalNum(totalnum.get());
model.setOnlineNum(onlinenum);
model.setTotalNum(totalnum);
model.setList(dyListBeans);
model.setFavorlist(favorList); model.setFavorlist(favorList);
} }
return Asserts.success(model); return Asserts.success(model);
} }
@Override
/** public ServiceBody<DyLineTreeListModel> getzzdyTreeList (Integer type, List<Integer> idlist){
* 获取电压等级列表 DyLineTreeListModel model = new DyLineTreeListModel();
* // ArrayList<DyLineTreeListModel.TerminalBean> favorList = new ArrayList<>();
* @return // List<DyLineAndTerminalWithHeartDto> list = dyLevelDao.selectListTreeList(CommonStatus.EFFECTIVE.value(), idlist);
*/ // boolean empty = CollectionUtil.isEmpty(list);
@Override // if (empty) {
public ServiceBody<DyListModel> getdyList() { // model.setList(new ArrayList<>());
DyListModel model = new DyListModel(); // } else {
List<DyLevel> list = dyLevelDao.selectAll(CommonStatus.EFFECTIVE.value()); // int onlinenum = 0;
boolean empty = CollectionUtil.isEmpty(list); // int totalnum = 0;
if (empty) { // ArrayList<DyLineTreeListModel.DyListBean> dyListBeans = new ArrayList<>();
model.setList(new ArrayList<>()); // for (int i = 0; i < list.size(); i++) {
} else { // DyLineAndTerminalWithHeartDto dyDto = list.get(i);
List<DyListModel.DyBean> models = BeanUtil.copyToList(list, DyListModel.DyBean.class); // List<LineAndTerminalWithHeartDto> linelist = dyDto.getList();
model.setList(models); // if (CollectionUtil.isEmpty(linelist)) {
// continue;
// }
// DyLineTreeListModel.DyListBean dyModel = new DyLineTreeListModel.DyListBean();
// dyModel.setId(dyDto.getId());
// dyModel.setDyValue(dyDto.getDyValue());
// dyModel.setName(dyDto.getName());
// ArrayList<DyLineTreeListModel.LineBean> lineBeans = new ArrayList<>();
// for (int j = 0; j < linelist.size(); j++) {
// LineAndTerminalWithHeartDto lineDto = linelist.get(j);
// List<TerminalsWithHeart> 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<DyLineTreeListModel.TerminalBean> 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
* @return */
*/ @Override
@Override public ServiceBody<DyListModel> getdyList () {
public ServiceBody<TerminalPhotosModel> getLastTowerList(String requestIp, LastTowerVo vo) { DyListModel model = new DyListModel();
TerminalPhotosModel model = new TerminalPhotosModel(); List<DyLevel> list = dyLevelDao.selectAll(CommonStatus.EFFECTIVE.value());
Integer id = vo.getId(); boolean empty = CollectionUtil.isEmpty(list);
Integer type = vo.getType(); if (empty) {
int pageindex = vo.getPageindex(); model.setList(new ArrayList<>());
int pagesize = vo.getPagesize(); } else {
List<DyLineAndTowertDto> dtos = new ArrayList<>(); List<DyListModel.DyBean> models = BeanUtil.copyToList(list, DyListModel.DyBean.class);
if (type == 1) { model.setList(models);
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<Integer> towerlist = new ArrayList<>();
for (DyLineAndTowertDto item : dtos) {
Integer towerId = item.getTowerId();
towerlist.add(towerId);
} }
return Asserts.success(model);
}
if (CollectionUtil.isEmpty(towerlist)) { /**
* 根据电压或者线路获取所有杆塔和最新照片
*
* @param vo
* @return
*/
@Override
public ServiceBody<TerminalPhotosModel> 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<DyLineAndTowertDto> 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<>()); model.setList(new ArrayList<>());
} else { } else {
PageUtils.SetPage(pageindex, pagesize); ArrayList<Integer> towerlist = new ArrayList<>();
List<TerminalChannelMapper> list = terminalChannelMapperDao.selectTermAndMapByTowerId(CommonStatus.EFFECTIVE.value(), towerlist); for (DyLineAndTowertDto item : dtos) {
List<TerminalPhotosModel.PhotosBean> beans = new ArrayList<>(); Integer towerId = item.getTowerId();
if (CollectionUtil.isNotEmpty(list)) { towerlist.add(towerId);
ArrayList<BigInteger> photolist = new ArrayList<>(); }
for (TerminalChannelMapper item : list) {
photolist.add(item.getPhotoId()); if (CollectionUtil.isEmpty(towerlist)) {
} model.setList(new ArrayList<>());
Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap(); } else {
Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap(); PageUtils.SetPage(pageindex, pagesize);
Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap(); List<TerminalChannelMapper> list = terminalChannelMapperDao.selectTermAndMapByTowerId(CommonStatus.EFFECTIVE.value(), towerlist);
Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap(); List<TerminalPhotosModel.PhotosBean> beans = new ArrayList<>();
Map<Integer, TowerDto> towerMap = cacheService.getTowerMap(); if (CollectionUtil.isNotEmpty(list)) {
List<TerminalPhoto> photoList = terminalPhotoDao.selectPhotosByIdList(photolist); ArrayList<BigInteger> photolist = new ArrayList<>();
for (TerminalChannelMapper item : list) {
List<TerminalImgAlarmsDto> imgarlarmsList = new ArrayList<>(); photolist.add(item.getPhotoId());
List idlist = new ArrayList<>(); }
for (TerminalPhoto tp : photoList) { Map<Integer, LineAndDyNameDto> lineMap = cacheService.getLineMap();
if (tp.getOrginalId() != null) { Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
idlist.add(tp.getOrginalId()); Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
List<TerminalPhoto> photoList = terminalPhotoDao.selectPhotosByIdList(photolist);
List<TerminalImgAlarmsDto> imgarlarmsList = new ArrayList<>();
List idlist = new ArrayList<>();
for (TerminalPhoto tp : photoList) {
if (tp.getOrginalId() != null) {
idlist.add(tp.getOrginalId());
}
}
if (idlist.size() > 0) {
List<TerminalImgAlarmParams> labellist = new ArrayList<>();
Map<Integer, TerminalImgAlarmParams> alarmParamMap = cacheService.getAlarmParamMap();
alarmParamMap.forEach((key, value) -> {
labellist.add(value);
});
imgarlarmsList = terminalImgAlarmsDao.selectAlarmsByTermidAndPhotoId(photoList, labellist);
} }
}
if (idlist.size() > 0) {
List<TerminalImgAlarmParams> labellist = new ArrayList<>();
Map<Integer, TerminalImgAlarmParams> 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);
} }
}

12
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java
Unescape Escape View File

@ -124,8 +124,6 @@ public class SysUserServiceImpl implements SysUserService {
return Asserts.success("修改成功"); return Asserts.success("修改成功");
} }
return Asserts.error("修改失败"); return Asserts.error("修改失败");
} }
@Override @Override
@ -159,7 +157,6 @@ public class SysUserServiceImpl implements SysUserService {
return Asserts.error("失败"); return Asserts.error("失败");
} }
@Override @Override
public SysUserSession selectUserById(String sessionId) { public SysUserSession selectUserById(String sessionId) {
SysUserSession session = sysUserMapperDao.selectUserBySessionId(sessionId); SysUserSession session = sysUserMapperDao.selectUserBySessionId(sessionId);
@ -185,15 +182,6 @@ public class SysUserServiceImpl implements SysUserService {
model.setList(new ArrayList<>()); model.setList(new ArrayList<>());
} else { } else {
List<SysUserModel.SysUserBean> beans = BeanUtil.copyToList(list,SysUserModel.SysUserBean.class, CopyOptions.create().ignoreCase()); List<SysUserModel.SysUserBean> beans = BeanUtil.copyToList(list,SysUserModel.SysUserBean.class, CopyOptions.create().ignoreCase());
// BeanUtil.copyToList()
// List<SysUserModel.SysUserBean> 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); model.setList(beans);
} }
PageInfo pageData = PageUtils.getPageData(list); PageInfo pageData = PageUtils.getPageData(list);

Write Preview
Loading…
Cancel
Save