设备基础信息中增加设备详细数据

fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceController.java

@@ -13,6 +13,7 @@ import com.fastbee.common.exception.ServiceException;
 import com.fastbee.common.utils.SecurityUtils;
 import com.fastbee.common.utils.StringUtils;
 import com.fastbee.common.utils.poi.ExcelUtil;
+import com.fastbee.data.service.devicedetail.IDeviceDetailService;
 import com.fastbee.iot.domain.Device;
 import com.fastbee.iot.domain.JiankongDeviceParam;
 import com.fastbee.iot.model.DeviceAssignmentVO;
@@ -52,7 +53,8 @@ import java.util.stream.Collectors;
 public class DeviceController extends BaseController {
     @Autowired
     private IDeviceService deviceService;
-
+    @Autowired
+    private IDeviceDetailService deviceDetailService;
     // @Lazy
     @Autowired
     private IMqttMessagePublish messagePublish;
@@ -165,6 +167,7 @@ public class DeviceController extends BaseController {
     @ApiOperation("获取设备详情")
     public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId) {
         Device device = deviceService.selectDeviceByDeviceId(deviceId);
+        device.setDeviceDetailVo(deviceDetailService.getDetailInfo(device));
         // 判断当前用户是否有设备分享权限 （设备所属机构管理员和设备所属用户有权限）
 //        LoginUser loginUser = getLoginUser();
 //        List<SysRole> roles = loginUser.getUser().getRoles();

fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java

@@ -112,7 +112,8 @@ public class UploadedPhotosController extends BaseController {
             //推送告警短信通知
             uploadedPhotosService.sendAlarmMessage(sn, doorState, shakeState,eventType);
             UploadedPhotos uploadedPhotos = new UploadedPhotos(
-                    null, fileName, monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState,cpuTemp,eventType,anFangStatus, date
+                    null, fileName, monitorPath, imei, sn, latitude, longitude,
+                    temperature, doorState, shakeState,cpuTemp,eventType,anFangStatus, date
             );
             return toAjax(uploadedPhotosService.insertUploadedPhotos(uploadedPhotos));
         } catch (IOException e) {