Browse Source

app绑定相机兼容传wifiName

lyhzzz 2 năm trước cách đây
mục cha
commit
19200a0c53

+ 2 - 0
src/main/java/com/fdkankan/ucenter/service/ICameraService.java

@@ -22,6 +22,8 @@ public interface ICameraService extends IService<Camera> {
 
 
     Camera getBySnCode(String snCode);
     Camera getBySnCode(String snCode);
 
 
+    Camera getByWfiName(String snCode);
+
     List<Camera> getCameraLikeSnCode(String trim);
     List<Camera> getCameraLikeSnCode(String trim);
 
 
     PageInfo pageList(CameraParam param);
     PageInfo pageList(CameraParam param);

+ 6 - 1
src/main/java/com/fdkankan/ucenter/service/impl/AppCameraService.java

@@ -66,7 +66,12 @@ public class AppCameraService {
         if(user == null){
         if(user == null){
             throw new BusinessException(AppConstant.FAILURE_CODE_4007, AppConstant.FAILURE_MSG_4007);
             throw new BusinessException(AppConstant.FAILURE_CODE_4007, AppConstant.FAILURE_MSG_4007);
         }
         }
-        Camera camera = cameraService.getBySnCode(snCode);
+        Camera camera = null;
+        if(snCode.contains("_")){
+            camera = cameraService.getByWfiName(snCode);
+        }else {
+            camera = cameraService.getBySnCode(snCode);
+        }
         if(camera == null){
         if(camera == null){
             throw new BusinessException(AppConstant.FAILURE_CODE_4010, AppConstant.FAILURE_MSG_4010);
             throw new BusinessException(AppConstant.FAILURE_CODE_4010, AppConstant.FAILURE_MSG_4010);
         }
         }

+ 1 - 0
src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -81,6 +81,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         }
         }
         return null;
         return null;
     }
     }
+    @Override
     public Camera getByWfiName(String snCode) {
     public Camera getByWfiName(String snCode) {
         LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Camera::getWifiName,snCode);
         wrapper.eq(Camera::getWifiName,snCode);