Merge branch 'bug-app-UpladCamera'

src/main/java/com/fdkankan/ucenter/controller/app/AppCameraController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.service.impl.AppCameraService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
@@ -13,6 +14,7 @@ import java.util.concurrent.CompletableFuture;
 
 @RestController
 @RequestMapping("/ucenter/app/camera")
+@Slf4j
 public class AppCameraController {
 
     @Autowired
@@ -65,9 +67,13 @@ public class AppCameraController {
                 || !param.containsKey("appVersion")) {
             return Result.failure(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
-        CompletableFuture.runAsync(() -> {
+        try {
             appCameraService.uploadUserCameraInfo(param.get("snCode"),param.get("cameraVersion"),param.get("appVersion"));
-        });
+        }catch ( Exception e){
+            log.error("uploadUserCameraInfo--snCode:{},cameraVersion:{},appVersion:{},error:{}",
+                    param.get("snCode"),param.get("cameraVersion"),param.get("appVersion"),e);
+        }
+
         return Result.success();
     }
 

src/main/java/com/fdkankan/ucenter/service/impl/CameraDetailServiceImpl.java

@@ -18,10 +18,7 @@ import org.joda.time.Days;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * <p>
@@ -201,7 +198,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         wrapper.eq(CameraDetail::getCameraId,id)
                 .set(CameraDetail::getUserCameraVersion,cameraVersion)
                 .set(CameraDetail::getAppVersion,appVersion)
-                .set(CameraDetail::getLastRequestTime,new DateTime());
+                .set(CameraDetail::getLastRequestTime,new Date());
         this.update(wrapper);
     }