|
|
@ -26,6 +26,7 @@ import com.shxy.xymanager_service.service.TerminalService;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
|
@ -62,6 +63,10 @@ public class TerminalServiceImpl implements TerminalService {
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
DyLevelDao dyLevelDao;
|
|
|
|
DyLevelDao dyLevelDao;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Value("${photo.address}")
|
|
|
|
|
|
|
|
private String photoaddress;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 获取所有设备列表
|
|
|
|
* 获取所有设备列表
|
|
|
|
*
|
|
|
|
*
|
|
|
@ -78,6 +83,11 @@ public class TerminalServiceImpl implements TerminalService {
|
|
|
|
if (empty) {
|
|
|
|
if (empty) {
|
|
|
|
model.setList(new ArrayList<>());
|
|
|
|
model.setList(new ArrayList<>());
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|
|
|
|
list.forEach(var->{
|
|
|
|
|
|
|
|
var.getList().stream().forEach(line->{
|
|
|
|
|
|
|
|
line.setPath(photoaddress+line.getPath());
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
});
|
|
|
|
List<TerminalListModel.TerminalBean> beans = BeanUtil.copyToList(list, TerminalListModel.TerminalBean.class, CopyOptions.create().ignoreCase());
|
|
|
|
List<TerminalListModel.TerminalBean> beans = BeanUtil.copyToList(list, TerminalListModel.TerminalBean.class, CopyOptions.create().ignoreCase());
|
|
|
|
model.setList(beans);
|
|
|
|
model.setList(beans);
|
|
|
|
}
|
|
|
|
}
|
|
|
|