订单设备异常事件字段补充

device-api-service/pom.xml

@@ -35,6 +35,12 @@
             <version>1.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>goods-api</artifactId>
+            <version>1.0</version>
+        </dependency>
+
         <dependency>
             <groupId>com.xy</groupId>
             <artifactId>xy-redis</artifactId>

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

@@ -69,6 +69,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     private final DeviceErrorsRecordServiceImpl deviceErrorsRecordService;
     private final DeviceDataServiceImpl deviceDataService;
 
+    private final GoodsDeviceService goodsDeviceService;
+
     private final RedisService<String> redisService;
 
     private final String keyPrefix = "device:history:";
@@ -643,7 +645,18 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
      * @return
      */
     private DeviceInfoDto.DeviceDataCountVO dataCount5(DeviceInfoDto.DeviceDataCountDTO dto) {
+        Long deviceId = dto.getDeviceId();
         DeviceInfoDto.DeviceDataCountVO vo = new DeviceInfoDto.DeviceDataCountVO();
+        DeviceStatus deviceStatus = deviceStatusService.getById(dto.getDeviceId());
+        DeviceInfoDto.GoodsData goodsData = copy(DeviceInfoDto.GoodsData.class, deviceStatus);
+        //在售商品种类
+        //根据设备ID查商品id
+        GoodsDeviceDto.SelectList selectList = new GoodsDeviceDto.SelectList();
+        selectList.setDeviceId(deviceId);
+        R<List<GoodsDeviceDto.Vo>> r = R.feignCheck(goodsDeviceService.list(selectList));
+        List<GoodsDeviceDto.Vo> goodsDeviceList = r.getData();
+        goodsData.setCategoryNum(CollUtil.isNotEmpty(goodsDeviceList) ? goodsDeviceList.size() : 0);
+        vo.setGoodsData(goodsData);
         return vo;
     }
 

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

@@ -586,6 +586,9 @@ public class DeviceInfoDto {
         @ApiModelProperty("(月)经营数据")
         BusinessData monthBusinessData;
 
+        @ApiModelProperty("商品统计数据")
+        GoodsData goodsData;
+
     }
 
 
@@ -613,7 +616,32 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "0元订单笔数")
         private Integer zeroCount;
 
-  
+    }
+
+    /**
+     * 商品管理统计数据
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class GoodsData {
+
+        @ApiModelProperty("在售商品种类")
+        private Integer categoryNum;
+
+
+        /**
+         * 设备商品在售库存数
+         */
+        @ApiModelProperty("可售库存")
+        private Integer stock;
+
+        /**
+         * 最近一次补货后的库存数
+         */
+        @ApiModelProperty("上次补货后库存")
+        private Integer afterFillStock;
+
+
     }