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

装置查询和首页查询bug优化

Browse Source
master
liuguijing 2 years ago
parent 49402df618
commit 9f9b40c22e
9 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermAndChannelDto.java
Unescape Escape View File

@ -12,7 +12,7 @@ public class TermAndChannelDto {
private Integer termid;
private List<TermChannelAndMapperDto> channellist;
private List<TermChannelAndMapperDto> list;
}

2
xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusDto.java
Unescape Escape View File

@ -39,6 +39,8 @@ public class TerminalsAndStatusDto implements Serializable {
private Double longitude;
private Integer status;
private Short signalStrength4g;
private BigInteger bootTime;

23
xymanager_dao/src/main/resources/mappers/DyLevelDao.xml
Unescape Escape View File

@ -137,18 +137,19 @@
b.name as line_name,
b.bs_manufacturer as bs_manufacturer,
b.dy_level_id as dy_level_id,
c.id as term_id,
c.tower_id as tower_id,
d.name as tower_name,
c.cmdid as cmdid,
c.equip_name as equip_name,
c.display_name as display_name,
c.model as model,
d.id as term_id,
d.tower_id as tower_id,
c.name as tower_name,
d.cmdid as cmdid,
d.equip_name as equip_name,
d.display_name as display_name,
d.model as model,
e.last_heartbeat as last_heartbeat
from ((((dy_level a left join `lines` b on a.id = b.dy_level_id and b.status = #{status} and a.status = #{status})
left join towers d on c.tower_id = d.id)
left join terminals c on b.id = c.line_id and c.status = #{status})
left join terminal_status e on e.term_id = c.id)
from ((((dy_level a left join `lines` b on a.id = b.dy_level_id )
left join towers c on b.id = c.line_id )
left join terminals d on c.id = d.tower_id )
left join terminal_status e on e.term_id = d.id)
where b.status = #{status} and a.status = #{status} and c.status = #{status} and d.status = #{status}
</select>
<select id="selectTreeListByChannelId" resultMap="LineAndTerminalNoHeartMap">

6
xymanager_dao/src/main/resources/mappers/LinesDao.xml
Unescape Escape View File

@ -33,7 +33,11 @@
y.name as dy_level_name
from `lines` x,
dy_level y
where x.dy_level_id = y.id and x.status = #{status} order by x.create_time desc
where x.dy_level_id = y.id
<if test="status != null">
and x.status = #{status}
</if>
order by x.create_time desc
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select

4
xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
Unescape Escape View File

@ -72,7 +72,9 @@
select
<include refid="Base_Column_List"/>
from terminal_channels
where status = #{status}
<if test="status != null">
where status = #{status}
</if>
</select>
<select id="selectTermChannelList" resultMap="TermAndChannelMap">

9
xymanager_dao/src/main/resources/mappers/TerminalsDao.xml
Unescape Escape View File

@ -38,6 +38,7 @@
<result column="bs_identifier" jdbcType="VARCHAR" property="bsIdentifier"/>
<result column="latitude" jdbcType="DOUBLE" property="latitude"/>
<result column="longitude" jdbcType="DOUBLE" property="longitude"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="signal_strength_4g" jdbcType="SMALLINT" property="signalStrength4g"/>
<result column="boot_time" jdbcType="INTEGER" property="bootTime"/>
<result column="battery_capacity" jdbcType="FLOAT" property="batteryCapacity"/>
@ -64,7 +65,10 @@
select
<include refid="Base_Column_List"/>
from terminals
where status = #{status}
<if test="status != null">
where status = #{status}
</if>
</select>
<select id="selectById" resultMap="BaseResultMap">
@ -132,6 +136,7 @@
a.bs_identifier as bs_identifier,
a.latitude as latitude,
a.longitude as longitude,
a.status as status,
b.signal_strength_4g as signal_strength_4g,
b.boot_time as boot_time,
b.battery_capacity as battery_capacity,
@ -140,7 +145,7 @@
from
(terminals a left join terminal_status b on a.id = b.term_id )
<if test="status != null">
a.status = #{status}
where a.status = #{status}
</if>
order by a.create_time desc
</select>

7
xymanager_dao/src/main/resources/mappers/TowerDao.xml
Unescape Escape View File

@ -25,7 +25,12 @@
t.status as status
from towers t,
`lines` l
where t.line_id = l.id and t.status = #{status,jdbcType=INTEGER} order by t.`order` asc,l.id desc
where t.line_id = l.id
<if test="status != null">
and t.status = #{status,jdbcType=INTEGER}
</if>
order by t.`order` asc,l.id desc
</select>
<select id="selectAllByLineid" resultType="com.shxy.xymanager_common.entity.Towers">

20
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java
Unescape Escape View File

@ -238,7 +238,7 @@ public class CacheServiceImpl implements CacheService {
@Cacheable(value = "termchannelMap")
public Map<Integer, TerminalChannels> getTermChannelMap() {
Map<Integer, TerminalChannels> termchannelMap = new HashMap<Integer, TerminalChannels>();
List<TerminalChannels> channelslist = terminalChannelsDao.selectChannelList(CommonStatus.EFFECTIVE.value());
List<TerminalChannels> channelslist = terminalChannelsDao.selectChannelList(null);
for (TerminalChannels item : channelslist) {
termchannelMap.put(item.getId(), item);
}
@ -249,7 +249,7 @@ public class CacheServiceImpl implements CacheService {
@Cacheable(value = "termAndchannelMap")
public Map<Integer, TermAndChannelDto> getTermAndChannelMap() {
Map<Integer, TermAndChannelDto> termchannelMap = new HashMap<Integer, TermAndChannelDto>();
List<TermAndChannelDto> list = terminalChannelsDao.selectTermChannelList(CommonStatus.EFFECTIVE.value());
List<TermAndChannelDto> list = terminalChannelsDao.selectTermChannelList(null);
for (TermAndChannelDto item : list) {
termchannelMap.put(item.getTermid(), item);
}
@ -261,7 +261,7 @@ public class CacheServiceImpl implements CacheService {
@Cacheable(value = "towerMap")
public Map<Integer, TowerDto> getTowerMap() {
Map<Integer, TowerDto> towerMap = new HashMap<Integer, TowerDto>();
List<TowerDto> towerlist = towerDao.selectAll(CommonStatus.EFFECTIVE.value());
List<TowerDto> towerlist = towerDao.selectAll(null);
for (TowerDto item : towerlist) {
towerMap.put(item.getId(), item);
}
@ -272,7 +272,7 @@ public class CacheServiceImpl implements CacheService {
@Cacheable(value = "terminalMap")
public Map<Integer, Terminals> getTerminalMap() {
Map<Integer, Terminals> terminalMap = new HashMap<Integer, Terminals>();
List<Terminals> termslist = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value());
List<Terminals> termslist = terminalsDao.selectAll(null);
for (Terminals item : termslist) {
terminalMap.put(item.getId(), item);
}
@ -283,7 +283,7 @@ public class CacheServiceImpl implements CacheService {
@Cacheable(value = "lineMap")
public Map<Integer, LineAndDyNameDto> getLineMap() {
Map<Integer, LineAndDyNameDto> lineMap = new HashMap<Integer, LineAndDyNameDto>();
List<LineAndDyNameDto> lineAndDyNameDtos = linesDao.selectAll(CommonStatus.EFFECTIVE.value());
List<LineAndDyNameDto> lineAndDyNameDtos = linesDao.selectAll(null);
for (LineAndDyNameDto lineitem : lineAndDyNameDtos) {
lineMap.put(lineitem.getId(), lineitem);
}
@ -329,7 +329,7 @@ public class CacheServiceImpl implements CacheService {
@CachePut(value = "termchannelMap")
public Map<Integer, TerminalChannels> updateTermChannelMap() {
Map<Integer, TerminalChannels> termchannelMap = new HashMap<Integer, TerminalChannels>();
List<TerminalChannels> channelslist = terminalChannelsDao.selectChannelList(CommonStatus.EFFECTIVE.value());
List<TerminalChannels> channelslist = terminalChannelsDao.selectChannelList(null);
for (TerminalChannels item : channelslist) {
termchannelMap.put(item.getId(), item);
}
@ -340,7 +340,7 @@ public class CacheServiceImpl implements CacheService {
@CachePut(value = "termAndchannelMap")
public Map<Integer, TermAndChannelDto> updateTermAndChannelMap() {
Map<Integer, TermAndChannelDto> termchannelMap = new HashMap<Integer, TermAndChannelDto>();
List<TermAndChannelDto> list = terminalChannelsDao.selectTermChannelList(CommonStatus.EFFECTIVE.value());
List<TermAndChannelDto> list = terminalChannelsDao.selectTermChannelList(null);
for (TermAndChannelDto item : list) {
termchannelMap.put(item.getTermid(), item);
}
@ -351,7 +351,7 @@ public class CacheServiceImpl implements CacheService {
@CachePut(value = "towerMap")
public Map<Integer, TowerDto> updateTowerMap() {
Map<Integer, TowerDto> towerMap = new HashMap<Integer, TowerDto>();
List<TowerDto> towerlist = towerDao.selectAll(CommonStatus.EFFECTIVE.value());
List<TowerDto> towerlist = towerDao.selectAll(null);
for (TowerDto item : towerlist) {
towerMap.put(item.getId(), item);
}
@ -362,7 +362,7 @@ public class CacheServiceImpl implements CacheService {
@CachePut(value = "terminalMap")
public Map<Integer, Terminals> updateTerminalMap() {
Map<Integer, Terminals> terminalMap = new HashMap<Integer, Terminals>();
List<Terminals> termslist = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value());
List<Terminals> termslist = terminalsDao.selectAll(null);
for (Terminals item : termslist) {
terminalMap.put(item.getId(), item);
}
@ -373,7 +373,7 @@ public class CacheServiceImpl implements CacheService {
@CachePut(value = "lineMap")
public Map<Integer, LineAndDyNameDto> updateLineMap() {
Map<Integer, LineAndDyNameDto> lineMap = new HashMap<Integer, LineAndDyNameDto>();
List<LineAndDyNameDto> lineAndDyNameDtos = linesDao.selectAll(CommonStatus.EFFECTIVE.value());
List<LineAndDyNameDto> lineAndDyNameDtos = linesDao.selectAll(null);
for (LineAndDyNameDto lineitem : lineAndDyNameDtos) {
lineMap.put(lineitem.getId(), lineitem);
}

13
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
Unescape Escape View File

@ -86,7 +86,7 @@ public class TerminalServiceImpl implements TerminalService {
int pageindex = vo.getPageindex();
int pagesize = vo.getPagesize();
PageUtils.SetPage(pageindex, pagesize);
List<TerminalsAndStatusDto> list2 = terminalsDao.selectTermAndStatusList(CommonStatus.EFFECTIVE.value());
List<TerminalsAndStatusDto> list2 = terminalsDao.selectTermAndStatusList(null);
boolean empty = CollectionUtil.isEmpty(list2);
if (empty) {
model.setList(new ArrayList<>());
@ -100,9 +100,12 @@ public class TerminalServiceImpl implements TerminalService {
Integer towerid = item.getTowerid();
terminalsBean.setId(item.getId());
terminalsBean.setTowerId(towerid);
terminalsBean.setTowerName(towerMap.get(towerid).getName());
terminalsBean.setLineId(towerMap.get(towerid).getLineId());
terminalsBean.setLineName(towerMap.get(towerid).getLineName());
TowerDto towerDto = towerMap.get(towerid);
if (BeanUtil.isNotEmpty(towerDto)) {
terminalsBean.setTowerName(towerDto.getName());
terminalsBean.setLineId(towerDto.getLineId());
terminalsBean.setLineName(towerDto.getLineName());
}
terminalsBean.setCmdId(item.getCmdid());
terminalsBean.setOrgId(item.getOrgId());
terminalsBean.setEquipName(item.getEquipName());
@ -127,7 +130,7 @@ public class TerminalServiceImpl implements TerminalService {
if (BeanUtil.isEmpty(termAndChannelDto)) {
terminalsBean.setList(list);
} else {
List<TermChannelAndMapperDto> channellist = termAndChannelDto.getChannellist();
List<TermChannelAndMapperDto> channellist = termAndChannelDto.getList();
if (CollectionUtil.isEmpty(channellist)) {
terminalsBean.setList(list);
} else {

Write Preview
Loading…
Cancel
Save