|
@@ -87,8 +87,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
* 质检商户code
|
|
|
*/
|
|
|
public static final String QA_MERC_CODE = "10001";
|
|
|
- private final CloudWalkApiService cloudWalkApiService;
|
|
|
- private final AlgorithmService algorithmService;
|
|
|
private final MercFeignService mercFeignService;
|
|
|
private final DeviceSysinfoServiceImpl deviceSysinfoService;
|
|
|
private final DeviceStatusServiceImpl deviceStatusService;
|
|
@@ -781,6 +779,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
districtMap = mercRegionService.getNameList(new MercRegionDto.GetNameListDto().setIds(districtIdList)).getData();
|
|
|
//根据区域id分组
|
|
|
Map<Long, List<DeviceInfo>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(DeviceInfo::getDistrictId));
|
|
|
+ DateTime date = DateTime.now();
|
|
|
+ DateTime start = DateUtil.beginOfDay(date);
|
|
|
+ DateTime end = DateUtil.endOfDay(date);
|
|
|
for (DeviceInfoDto.MercHomeCountVO v : list) {
|
|
|
DeviceInfoDto.MercHomeListVO vo = new DeviceInfoDto.MercHomeListVO();
|
|
|
Long districtId = v.getDistrictId();
|