补扣调整

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -532,7 +532,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
     @ApiOperation("小程序商户设备搜索")
     @Override
-    public R<PageBean<DeviceInfoDto.Vo2>> mercDeviceSearchPage(@RequestBody DeviceInfoDto.Page page) {
+    public R<PageBean<DeviceInfoDto.MerHomeSearchVO>> mercDeviceSearchPage(@RequestBody DeviceInfoDto.Page page) {
+        PageBean<DeviceInfoDto.MerHomeSearchVO> pageData = new PageBean<>();
         //小程序独有查询字段 缺货状态：stockStatus ，是否查故障设备：fault
         Boolean fault = page.getFault();
         Long mercId = page.getMercId();
@@ -550,31 +551,38 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         PageBean<DeviceInfoDto.Vo2> pageBean = queryPage(page);
         List<DeviceInfoDto.Vo2> records = pageBean.getRecords();
         if (CollUtil.isNotEmpty(records)) {
-            List<Long> deviceIds = records.stream().map(DeviceInfoDto.Vo2::getDeviceId).collect(Collectors.toList());
-
-
-            String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
-            String todayDate = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN);
-            //查询当天
-            DeviceDataDto.ListDTO dto = new DeviceDataDto.ListDTO()
-                    .setDeviceIds(deviceIds).setType(type).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
-            List<DeviceDataDto.Vo> deviceDataList = deviceDataService.list(dto);
-            if (CollUtil.isNotEmpty(deviceDataList)) {
-                //统计数据反显
-                Map<Long, DeviceDataDto.Vo> dataMap = deviceDataList.stream().collect(Collectors.toMap(DeviceDataDto.Vo::getDeviceId, d -> d));
-                records.forEach(v -> {
-                    Long deviceId = v.getDeviceId();
-                    DeviceDataDto.Vo vo = dataMap.get(deviceId);
-                    //今日订单数
-                    v.setDayOrderNum(vo != null ? vo.getSalesCount() : 0);
-                    v.setDaySalesPrice(vo != null ? vo.getSalesMoney() : 0);
-                });
-                pageBean.setRecords(records);
-            }
-
-
+            return R.ok(pageData);
+        }
+        List<DeviceInfoDto.MerHomeSearchVO> merHomeSearchRecords = new ArrayList<>();
+        List<Long> deviceIds = records.stream().map(DeviceInfoDto.Vo2::getDeviceId).collect(Collectors.toList());
+        String type = SysDictUtils.getValue(DictEnum.DEVICE_DATA_TYPE.getKey(), DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey(), String.class);
+        String todayDate = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN);
+        //查询当天
+        DeviceDataDto.ListDTO dto = new DeviceDataDto.ListDTO()
+                .setDeviceIds(deviceIds).setType(type).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
+        BeanUtil.copyProperties(pageBean, pageData);
+        List<DeviceDataDto.Vo> deviceDataList = deviceDataService.list(dto);
+        if (CollUtil.isNotEmpty(deviceDataList)) {
+            //统计数据反显
+            Map<Long, DeviceDataDto.Vo> dataMap = deviceDataList.stream().collect(Collectors.toMap(DeviceDataDto.Vo::getDeviceId, d -> d));
+            records.forEach(v -> {
+                DeviceInfoDto.MerHomeSearchVO merHomeSearchVO = new DeviceInfoDto.MerHomeSearchVO();
+                Long deviceId = v.getDeviceId();
+                DeviceDataDto.Vo vo = dataMap.get(deviceId);
+                //今日订单数
+                v.setDayOrderNum(vo != null ? vo.getSalesCount() : 0);
+                v.setDaySalesPrice(vo != null ? vo.getSalesMoney() : 0);
+                DeviceSysinfoDto.Vo deviceSysinfo = v.getDeviceSysinfo();
+                DeviceStatusDto.Vo deviceStatus = v.getDeviceStatus();
+                BeanUtil.copyProperties(vo, merHomeSearchVO);
+                merHomeSearchVO.setAppUpmVersion(deviceSysinfo.getAppUpmVersion());
+                merHomeSearchVO.setTempValue(deviceStatus.getTempValue());
+                merHomeSearchVO.setNetDbm(deviceStatus.getNetDbm());
+                merHomeSearchRecords.add(merHomeSearchVO);
+            });
+            pageData.setRecords(merHomeSearchRecords);
         }
-        return R.ok(pageBean);
+        return R.ok(pageData);
     }
 
     @ApiOperation("小程序商户设备详情-数据统计")

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -341,6 +341,63 @@ public class DeviceInfoDto {
         private Integer daySalesPrice;
 
 
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class MerHomeSearchVO {
+
+
+        @ApiModelProperty("今日订单数")
+        private Integer dayOrderNum;
+
+        @ApiModelProperty("今日销售额")
+        private Integer daySalesPrice;
+
+
+        @ApiModelProperty("设备id")
+        private Long deviceId;
+
+        @ApiModelProperty("设备名称")
+        private String deviceName;
+
+        @DictFormat(DictConsts.DEVICE_TYPE)
+        @ApiModelProperty("设备类型")
+        private Integer deviceType;
+
+        @ApiModelProperty("商户编码")
+        private String mercCode;
+
+        @ApiModelProperty("商户名称")
+        private String mercName;
+
+
+        @DictFormat(DictConsts.DEVICE_BUSY_STATUS)
+        @ApiModelProperty("运营状态")
+        private Integer busyState;
+
+
+        @DictFormat(DictConsts.DEVICE_FAULT_LEVEL)
+        @ApiModelProperty("故障等级")
+        private Integer faultLevel;
+
+
+        @ApiModelProperty("更新时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime updateTime;
+
+
+        @ApiModelProperty("上位机版本号=软件版本号")
+        private String appUpmVersion;
+
+
+        @ApiModelProperty("联网信号强度")
+        private Integer netDbm;
+
+        @ApiModelProperty("温度值")
+        private Integer tempValue;
+ 
+
     }
 
 

device-api/src/main/java/com/xy/service/DeviceInfoService.java

@@ -132,7 +132,7 @@ public interface DeviceInfoService {
      * @return
      */
     @PostMapping("mercDeviceSearchPage")
-    R<PageBean<DeviceInfoDto.Vo2>> mercDeviceSearchPage(@RequestBody @Validated DeviceInfoDto.Page page);
+    R<PageBean<DeviceInfoDto.MerHomeSearchVO>> mercDeviceSearchPage(@RequestBody @Validated DeviceInfoDto.Page page);
 
     /**
      * 小程序商户设备详情-数据统计