|
|
@@ -14,9 +14,7 @@ import com.xy.device.EnumDeviceActiveStatus;
|
|
|
import com.xy.device.EnumDeviceFreezeStatus;
|
|
|
import com.xy.dto.*;
|
|
|
import com.xy.dto.be.MercDto;
|
|
|
-import com.xy.dto.common.MercLineDto;
|
|
|
import com.xy.dto.common.MercPlaceDto;
|
|
|
-import com.xy.dto.mini.MiniMercRegionDto;
|
|
|
import com.xy.entity.*;
|
|
|
import com.xy.enums.MercStatus;
|
|
|
import com.xy.service.*;
|
|
|
@@ -41,7 +39,6 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import javax.validation.Valid;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
import java.util.Objects;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -197,14 +194,8 @@ public class MercMiniDeviceController {
|
|
|
List<MercPlaceDto.Vo> merPlaceList = R.feignCheckData(mercPlaceService.list(new MercPlaceDto.ListDto().setIds(CollUtil.newArrayList(placeId))));
|
|
|
MercPlaceDto.Vo mercPlace = CollUtil.isNotEmpty(merPlaceList) ? merPlaceList.get(0) : null;
|
|
|
vo.setPlaceName(mercPlace == null ? StrUtil.EMPTY : mercPlace.getPlaceName());
|
|
|
- //线路
|
|
|
- Long placeLineId = vo.getPlaceLineId();
|
|
|
- Map<Long, String> placeLineMap = R.feignCheckData(mercLineService.getNameList(new MercLineDto.GetNameListDto().setIds(CollUtil.newArrayList(placeLineId))));
|
|
|
- vo.setPlaceLineName(CollUtil.isEmpty(placeLineMap) ? StrUtil.EMPTY : placeLineMap.get(placeLineId));
|
|
|
- //区域
|
|
|
- Long districtId = vo.getDistrictId();
|
|
|
- Map<Long, String> districtMap = R.feignCheckData(mercPlaceService.merReginId2Name(new MiniMercRegionDto.IdList().setIds(CollUtil.newArrayList(districtId))));
|
|
|
- vo.setDistrictName(CollUtil.isEmpty(districtMap) ? StrUtil.EMPTY : districtMap.get(districtId));
|
|
|
+ //返显区域名称
|
|
|
+ vo.setDistrictName(mercPlace.getRegionName());
|
|
|
DeviceStatusDto.Vo deviceStatus = vo.getDeviceStatus();
|
|
|
vo.setNetStateName(deviceStatus == null ? StrUtil.EMPTY : DeviceNetSateType.getEnumByCode(deviceStatus.getNetState()).getDescription());
|
|
|
if (deviceStatus != null) {
|
