diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index 6698439..c1683f7 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -175,7 +175,7 @@ ( SELECT path,term_id,channel_id from terminal_photos - where id in (select max(id) from terminal_photos GROUP BY term_id,channel_id) + where id in (select max(id) from terminal_photos where media_type =1 GROUP BY term_id,channel_id) ) tp on tp.channel_id = e.id and tp.term_id = a.id ) WHERE a.status = 1 order by a.create_time desc diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index b8ec466..fcc856c 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -26,6 +26,7 @@ import com.shxy.xymanager_service.service.TerminalService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -62,6 +63,10 @@ public class TerminalServiceImpl implements TerminalService { @Autowired DyLevelDao dyLevelDao; + @Value("${photo.address}") + private String photoaddress; + + /** * 获取所有设备列表 * @@ -78,6 +83,11 @@ public class TerminalServiceImpl implements TerminalService { if (empty) { model.setList(new ArrayList<>()); } else { + list.forEach(var->{ + var.getList().stream().forEach(line->{ + line.setPath(photoaddress+line.getPath()); + }); + }); List beans = BeanUtil.copyToList(list, TerminalListModel.TerminalBean.class, CopyOptions.create().ignoreCase()); model.setList(beans); }