Merge branch 'master' into prod

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

@@ -1860,6 +1860,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         List<DeviceInfoDto.Vo2> records = pageBean.getRecords();
         JMap<Long, List<DevicePart>> cover;
         if (Emptys.check(records)) {
+            JMap<Long, DeviceInfoQueryPage> queryPageJMap = new JArrayList<>(iPage.getRecords()).toMap(DeviceInfoQueryPage::getDeviceId).cover();
+            records.forEach(vo2 -> {
+                DeviceInfoQueryPage deviceInfoQueryPage = queryPageJMap.get(vo2.getDeviceId());
+                DeviceSysinfoDto.Vo deviceSysinfo = deviceInfoQueryPage.getDeviceSysinfo();
+                vo2.setSimIsp(deviceSysinfo.getSimIsp()).setSimIccid(deviceSysinfo.getSimIccid());
+            });
             List<DevicePart> deviceParts = devicePartService.list(new LambdaQueryWrapper<DevicePart>()
                     .in(DevicePart::getDeviceId, new JArrayList<>(records).getProperty(DeviceInfoDto.Vo2::getDeviceId))
                     .orderByDesc(DevicePart::getCode)

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

@@ -816,6 +816,12 @@ public class DeviceInfoDto {
         @ApiModelProperty("今日销售额")
         private Integer daySalesPrice;
 
+        @ApiModelProperty("流量卡运营商")
+        private String simIsp;
+
+        @ApiModelProperty("流量卡号")
+        private String simIccid;
+
         @ApiModelProperty("配件集合")
         private List<DevicePartDto.Vo> deviceParts;
     }
@@ -960,6 +966,12 @@ public class DeviceInfoDto {
         @ApiModelProperty("故障等级")
         private Integer faultLevel;
 
+        @ExcelProperty("流量卡运营商")
+        private String simIsp;
+
+        @ExcelProperty("流量卡号")
+        private String simIccid;
+
     }