1

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.fdkankan.ucenter</groupId>
-    <artifactId>4dkankan-center-user</artifactId>
+    <artifactId>4dkankan-center-ucenter</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 

src/main/java/com/fdkankan/user/UserCenterApplication.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user;
+package com.fdkankan.ucenter;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;

src/main/java/com/fdkankan/user/common/CameraTypeEnum.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.common;
+package com.fdkankan.ucenter.common;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/fdkankan/user/common/RedisKeyUtil.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.common;
+package com.fdkankan.ucenter.common;
 
 public class RedisKeyUtil {
 

src/main/java/com/fdkankan/user/common/Result.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.common;
+package com.fdkankan.ucenter.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/fdkankan/user/constant/LoginConstant.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.constant;
+package com.fdkankan.ucenter.constant;
 
 // 3001-4000 登陆注册状态码
 public class LoginConstant {

src/main/java/com/fdkankan/user/controller/AppController.java

@@ -1,9 +1,8 @@
-package com.fdkankan.user.controller;
+package com.fdkankan.ucenter.controller;
 
-import com.fdkankan.user.common.Result;
-import com.fdkankan.user.service.impl.AppService;
-import com.fdkankan.user.service.impl.LoginService;
-import com.fdkankan.user.vo.request.LoginParam;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.impl.AppService;
+import com.fdkankan.ucenter.vo.request.LoginParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/com/fdkankan/user/controller/CameraController.java

@@ -1,16 +1,14 @@
-package com.fdkankan.user.controller;
+package com.fdkankan.ucenter.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.user.common.Result;
-import com.fdkankan.user.constant.LoginConstant;
-import com.fdkankan.user.entity.User;
-import com.fdkankan.user.service.ICameraDetailService;
-import com.fdkankan.user.service.ICameraService;
-import com.fdkankan.user.service.ISceneResourceService;
-import com.fdkankan.user.vo.request.CameraParam;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.constant.LoginConstant;
+import com.fdkankan.ucenter.service.ICameraDetailService;
+import com.fdkankan.ucenter.service.ICameraService;
+import com.fdkankan.ucenter.service.ISceneResourceService;
+import com.fdkankan.ucenter.vo.request.CameraParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/fdkankan/user/controller/FolderController.java

@@ -1,11 +1,10 @@
-package com.fdkankan.user.controller;
+package com.fdkankan.ucenter.controller;
 
 
-import cn.hutool.jwt.JWT;
 import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.user.common.Result;
-import com.fdkankan.user.service.IFolderService;
-import com.fdkankan.user.vo.request.FolderParam;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.IFolderService;
+import com.fdkankan.ucenter.vo.request.FolderParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/fdkankan/user/controller/IncrementController.java

@@ -1,14 +1,12 @@
-package com.fdkankan.user.controller;
+package com.fdkankan.ucenter.controller;
 
 import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.user.common.Result;
-import com.fdkankan.user.service.IUserIncrementService;
-import com.fdkankan.user.vo.request.IncrementParam;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.IUserIncrementService;
+import com.fdkankan.ucenter.vo.request.IncrementParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
 @RestController
 @RequestMapping("/api/user/increment")
 public class IncrementController {

src/main/java/com/fdkankan/user/controller/LoginController.java

@@ -1,12 +1,11 @@
-package com.fdkankan.user.controller;
+package com.fdkankan.ucenter.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.user.common.Result;
-import com.fdkankan.user.service.impl.LoginService;
-import com.fdkankan.user.vo.request.LoginParam;
-import com.fdkankan.user.vo.request.RegisterParam;
-import org.apache.commons.lang3.StringUtils;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.impl.LoginService;
+import com.fdkankan.ucenter.vo.request.LoginParam;
+import com.fdkankan.ucenter.vo.request.RegisterParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/fdkankan/user/controller/SceneController.java

@@ -1,10 +1,9 @@
-package com.fdkankan.user.controller;
+package com.fdkankan.ucenter.controller;
 
 
-import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.user.common.Result;
-import com.fdkankan.user.service.ISceneProService;
-import com.fdkankan.user.service.IUserService;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.ISceneProService;
+import com.fdkankan.ucenter.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestHeader;

src/main/java/com/fdkankan/user/controller/SceneCooperationController.java

@@ -1,9 +1,8 @@
-package com.fdkankan.user.controller;
+package com.fdkankan.ucenter.controller;
 
-import com.fdkankan.user.common.Result;
-import com.fdkankan.user.entity.SceneCooperation;
-import com.fdkankan.user.service.ISceneCooperationService;
-import com.fdkankan.user.vo.request.SceneCooperationParam;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.ISceneCooperationService;
+import com.fdkankan.ucenter.vo.request.SceneCooperationParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/com/fdkankan/user/controller/UserController.java

@@ -1,15 +1,13 @@
-package com.fdkankan.user.controller;
+package com.fdkankan.ucenter.controller;
 
-import cn.hutool.jwt.JWT;
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.user.common.Result;
-import com.fdkankan.user.service.IUserService;
-import com.fdkankan.user.service.impl.LoginService;
-import com.fdkankan.user.vo.request.RegisterParam;
-import com.fdkankan.user.vo.request.ShipAddressParam;
-import com.fdkankan.user.vo.request.UserParam;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.service.impl.LoginService;
+import com.fdkankan.ucenter.vo.request.RegisterParam;
+import com.fdkankan.ucenter.vo.request.ShipAddressParam;
+import com.fdkankan.ucenter.vo.request.UserParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/fdkankan/user/entity/Camera.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/fdkankan/user/entity/CameraDetail.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/fdkankan/user/entity/CameraSpace.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

src/main/java/com/fdkankan/user/entity/Folder.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/ReceiverInfo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/Scene.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/SceneCooperation.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/ScenePlus.java

@@ -1,9 +1,9 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/ScenePlusExt.java

@@ -1,9 +1,9 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/ScenePro.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/SceneResource.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/SceneResourceCamera.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/SceneResourceCooperation.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/User.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/entity/UserIncrement.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.entity;
+package com.fdkankan.ucenter.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/fdkankan/user/exception/GlobalExceptionHandler.java

@@ -1,7 +1,7 @@
-package com.fdkankan.user.exception;
+package com.fdkankan.ucenter.exception;
 
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.user.common.Result;
+import com.fdkankan.ucenter.common.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;

src/main/java/com/fdkankan/user/generate/AutoGenerate.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.generate;
+package com.fdkankan.ucenter.generate;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.generator.FastAutoGenerator;
@@ -17,7 +17,7 @@ public class AutoGenerate {
 
         String path =System.getProperty("user.dir") ;
 
-        generate(path,"user", getTables(new String[]{
+        generate(path,"ucenter", getTables(new String[]{
                 "t_folder"
         }));
 

src/main/java/com/fdkankan/user/mapper/ICameraDetailMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.CameraDetail;
+import com.fdkankan.ucenter.entity.CameraDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/fdkankan/user/mapper/ICameraMapper.java

@@ -1,10 +1,10 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.user.entity.Camera;
+import com.fdkankan.ucenter.entity.Camera;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.user.vo.request.CameraParam;
-import com.fdkankan.user.vo.response.CameraVo;
+import com.fdkankan.ucenter.vo.request.CameraParam;
+import com.fdkankan.ucenter.vo.response.CameraVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/fdkankan/user/mapper/ICameraSpaceMapper.java

@@ -1,8 +1,8 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.CameraSpace;
+import com.fdkankan.ucenter.entity.CameraSpace;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.user.vo.response.CameraSpaceVo;
+import com.fdkankan.ucenter.vo.response.CameraSpaceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/fdkankan/user/mapper/IFolderMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.Folder;
+import com.fdkankan.ucenter.entity.Folder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/fdkankan/user/mapper/IReceiverInfoMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.ReceiverInfo;
+import com.fdkankan.ucenter.entity.ReceiverInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/fdkankan/user/mapper/ISceneCooperationMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.SceneCooperation;
+import com.fdkankan.ucenter.entity.SceneCooperation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/fdkankan/user/mapper/ISceneMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.Scene;
+import com.fdkankan.ucenter.entity.Scene;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/fdkankan/user/mapper/IScenePlusExtMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.ScenePlusExt;
+import com.fdkankan.ucenter.entity.ScenePlusExt;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/fdkankan/user/mapper/IScenePlusMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.ScenePlus;
+import com.fdkankan.ucenter.entity.ScenePlus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/fdkankan/user/mapper/ISceneProMapper.java

@@ -1,8 +1,8 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.ScenePro;
+import com.fdkankan.ucenter.entity.ScenePro;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.user.vo.response.GroupByCount;
+import com.fdkankan.ucenter.vo.response.GroupByCount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/fdkankan/user/mapper/ISceneResourceCameraMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.SceneResourceCamera;
+import com.fdkankan.ucenter.entity.SceneResourceCamera;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/fdkankan/user/mapper/ISceneResourceCooperationMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.SceneResourceCooperation;
+import com.fdkankan.ucenter.entity.SceneResourceCooperation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/fdkankan/user/mapper/ISceneResourceMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.SceneResource;
+import com.fdkankan.ucenter.entity.SceneResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/fdkankan/user/mapper/IUserIncrementMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.UserIncrement;
+import com.fdkankan.ucenter.entity.UserIncrement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/fdkankan/user/mapper/IUserMapper.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.mapper;
+package com.fdkankan.ucenter.mapper;
 
-import com.fdkankan.user.entity.User;
+import com.fdkankan.ucenter.entity.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

src/main/java/com/fdkankan/user/service/ICameraDetailService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.CameraDetail;
+import com.fdkankan.ucenter.entity.CameraDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.HashMap;

src/main/java/com/fdkankan/user/service/ICameraService.java

@@ -1,11 +1,9 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.alibaba.fastjson.JSONArray;
 import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.user.entity.Camera;
+import com.fdkankan.ucenter.entity.Camera;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.user.entity.SceneResource;
-import com.fdkankan.user.vo.request.CameraParam;
+import com.fdkankan.ucenter.vo.request.CameraParam;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/fdkankan/user/service/ICameraSpaceService.java

@@ -1,8 +1,8 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.CameraSpace;
+import com.fdkankan.ucenter.entity.CameraSpace;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.user.vo.response.CameraSpaceVo;
+import com.fdkankan.ucenter.vo.response.CameraSpaceVo;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/fdkankan/user/service/IFolderService.java

@@ -1,8 +1,8 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.Folder;
+import com.fdkankan.ucenter.entity.Folder;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.user.vo.request.FolderParam;
+import com.fdkankan.ucenter.vo.request.FolderParam;
 
 /**
  * <p>

src/main/java/com/fdkankan/user/service/IReceiverInfoService.java

@@ -1,8 +1,8 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.ReceiverInfo;
+import com.fdkankan.ucenter.entity.ReceiverInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.user.vo.request.ShipAddressParam;
+import com.fdkankan.ucenter.vo.request.ShipAddressParam;
 
 import java.util.List;
 

src/main/java/com/fdkankan/user/service/ISceneCooperationService.java

@@ -1,11 +1,11 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.user.entity.SceneCooperation;
+import com.fdkankan.ucenter.entity.SceneCooperation;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.user.entity.ScenePlus;
-import com.fdkankan.user.entity.ScenePro;
-import com.fdkankan.user.vo.request.SceneCooperationParam;
+import com.fdkankan.ucenter.entity.ScenePlus;
+import com.fdkankan.ucenter.entity.ScenePro;
+import com.fdkankan.ucenter.vo.request.SceneCooperationParam;
 
 import java.util.List;
 

src/main/java/com/fdkankan/user/service/IScenePlusExtService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.ScenePlusExt;
+import com.fdkankan.ucenter.entity.ScenePlusExt;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.HashMap;

src/main/java/com/fdkankan/user/service/IScenePlusService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.ScenePlus;
+import com.fdkankan.ucenter.entity.ScenePlus;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

src/main/java/com/fdkankan/user/service/ISceneProService.java

@@ -1,10 +1,10 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.CameraDetail;
-import com.fdkankan.user.entity.ScenePro;
+import com.fdkankan.ucenter.entity.CameraDetail;
+import com.fdkankan.ucenter.entity.ScenePro;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.user.vo.response.GroupByCount;
-import com.fdkankan.user.vo.response.SceneNumVo;
+import com.fdkankan.ucenter.vo.response.GroupByCount;
+import com.fdkankan.ucenter.vo.response.SceneNumVo;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/fdkankan/user/service/ISceneResourceCameraService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.SceneResourceCamera;
+import com.fdkankan.ucenter.entity.SceneResourceCamera;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

src/main/java/com/fdkankan/user/service/ISceneResourceCooperationService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.SceneResourceCooperation;
+import com.fdkankan.ucenter.entity.SceneResourceCooperation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

src/main/java/com/fdkankan/user/service/ISceneResourceService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.SceneResource;
+import com.fdkankan.ucenter.entity.SceneResource;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

src/main/java/com/fdkankan/user/service/ISceneService.java

@@ -1,6 +1,6 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.Scene;
+import com.fdkankan.ucenter.entity.Scene;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

src/main/java/com/fdkankan/user/service/IUserIncrementService.java

@@ -1,9 +1,9 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.user.entity.UserIncrement;
+import com.fdkankan.ucenter.entity.UserIncrement;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.user.vo.request.IncrementParam;
+import com.fdkankan.ucenter.vo.request.IncrementParam;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/fdkankan/user/service/IUserService.java

@@ -1,12 +1,12 @@
-package com.fdkankan.user.service;
+package com.fdkankan.ucenter.service;
 
-import com.fdkankan.user.entity.ReceiverInfo;
-import com.fdkankan.user.entity.User;
+import com.fdkankan.ucenter.entity.ReceiverInfo;
+import com.fdkankan.ucenter.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.user.vo.request.RegisterParam;
-import com.fdkankan.user.vo.request.ShipAddressParam;
-import com.fdkankan.user.vo.request.UserParam;
-import com.fdkankan.user.vo.response.UserVo;
+import com.fdkankan.ucenter.vo.request.RegisterParam;
+import com.fdkankan.ucenter.vo.request.ShipAddressParam;
+import com.fdkankan.ucenter.vo.request.UserParam;
+import com.fdkankan.ucenter.vo.response.UserVo;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/fdkankan/user/service/impl/AppService.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.exception.BusinessException;
@@ -6,16 +6,16 @@ import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.user.common.RedisKeyUtil;
-import com.fdkankan.user.constant.LoginConstant;
-import com.fdkankan.user.entity.User;
-import com.fdkankan.user.service.ICameraDetailService;
-import com.fdkankan.user.service.IScenePlusService;
-import com.fdkankan.user.service.ISceneProService;
-import com.fdkankan.user.service.IUserService;
-import com.fdkankan.user.vo.request.LoginParam;
-import com.fdkankan.user.vo.response.LoginVo;
-import com.fdkankan.user.vo.response.UserVo;
+import com.fdkankan.ucenter.common.RedisKeyUtil;
+import com.fdkankan.ucenter.constant.LoginConstant;
+import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.service.ICameraDetailService;
+import com.fdkankan.ucenter.service.IScenePlusService;
+import com.fdkankan.ucenter.service.ISceneProService;
+import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.vo.request.LoginParam;
+import com.fdkankan.ucenter.vo.response.LoginVo;
+import com.fdkankan.ucenter.vo.response.UserVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,18 +1,14 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.Constant;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.user.common.CameraTypeEnum;
-import com.fdkankan.user.entity.*;
-import com.fdkankan.user.mapper.ICameraDetailMapper;
-import com.fdkankan.user.service.*;
+import com.fdkankan.ucenter.entity.*;
+import com.fdkankan.ucenter.mapper.ICameraDetailMapper;
+import com.fdkankan.ucenter.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.user.vo.response.CameraSpaceVo;
+import com.fdkankan.ucenter.vo.response.CameraSpaceVo;
 import org.joda.time.DateTime;
 import org.joda.time.Days;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +17,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

src/main/java/com/fdkankan/user/service/impl/CameraServiceImpl.java

@@ -1,28 +1,25 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileSizeUtil;
-import com.fdkankan.user.common.CameraTypeEnum;
-import com.fdkankan.user.entity.*;
-import com.fdkankan.user.mapper.ICameraMapper;
-import com.fdkankan.user.service.*;
+import com.fdkankan.ucenter.entity.*;
+import com.fdkankan.ucenter.mapper.ICameraMapper;
+import com.fdkankan.ucenter.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.user.util.DateUserUtil;
-import com.fdkankan.user.vo.request.CameraParam;
-import com.fdkankan.user.vo.response.CameraSpaceVo;
-import com.fdkankan.user.vo.response.CameraVo;
-import com.fdkankan.user.vo.response.GroupByCount;
+import com.fdkankan.ucenter.util.DateUserUtil;
+import com.fdkankan.ucenter.vo.request.CameraParam;
+import com.fdkankan.ucenter.vo.response.CameraSpaceVo;
+import com.fdkankan.ucenter.vo.response.CameraVo;
+import com.fdkankan.ucenter.vo.response.GroupByCount;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.Days;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
 import java.util.*;
 import java.util.stream.Collectors;

src/main/java/com/fdkankan/user/service/impl/CameraSpaceServiceImpl.java

@@ -1,11 +1,10 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
-import cn.hutool.core.lang.hash.Hash;
-import com.fdkankan.user.entity.CameraSpace;
-import com.fdkankan.user.mapper.ICameraSpaceMapper;
-import com.fdkankan.user.service.ICameraSpaceService;
+import com.fdkankan.ucenter.entity.CameraSpace;
+import com.fdkankan.ucenter.mapper.ICameraSpaceMapper;
+import com.fdkankan.ucenter.service.ICameraSpaceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.user.vo.response.CameraSpaceVo;
+import com.fdkankan.ucenter.vo.response.CameraSpaceVo;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;

src/main/java/com/fdkankan/user/service/impl/FdkkLaserService.java

@@ -1,14 +1,13 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.constant.Constant;
-import com.fdkankan.user.common.CameraTypeEnum;
-import com.fdkankan.user.common.Result;
-import com.fdkankan.user.entity.Camera;
-import com.fdkankan.user.entity.CameraDetail;
-import com.fdkankan.user.entity.User;
-import com.fdkankan.user.service.IUserService;
-import com.fdkankan.user.vo.response.SceneNumVo;
+import com.fdkankan.ucenter.common.CameraTypeEnum;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.entity.Camera;
+import com.fdkankan.ucenter.entity.CameraDetail;
+import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.vo.response.SceneNumVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/fdkankan/user/service/impl/FolderServiceImpl.java

@@ -1,13 +1,13 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fdkankan.user.entity.Folder;
-import com.fdkankan.user.entity.User;
-import com.fdkankan.user.mapper.IFolderMapper;
-import com.fdkankan.user.service.IFolderService;
+import com.fdkankan.ucenter.entity.Folder;
+import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.mapper.IFolderMapper;
+import com.fdkankan.ucenter.service.IFolderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.user.service.IUserService;
-import com.fdkankan.user.vo.request.FolderParam;
+import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.vo.request.FolderParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/fdkankan/user/service/impl/LoginService.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ConstantFilePath;
@@ -9,18 +9,18 @@ import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.sms.SendMailAcceUtils;
 import com.fdkankan.sms.SmsService;
-import com.fdkankan.user.common.RedisKeyUtil;
-import com.fdkankan.user.constant.LoginConstant;
-import com.fdkankan.user.entity.Camera;
-import com.fdkankan.user.entity.CameraDetail;
-import com.fdkankan.user.entity.User;
-import com.fdkankan.user.service.ICameraDetailService;
-import com.fdkankan.user.service.ICameraService;
-import com.fdkankan.user.service.IUserService;
-import com.fdkankan.user.vo.request.LoginParam;
-import com.fdkankan.user.vo.request.RegisterParam;
-import com.fdkankan.user.vo.response.LoginVo;
-import com.fdkankan.user.vo.response.UserVo;
+import com.fdkankan.ucenter.common.RedisKeyUtil;
+import com.fdkankan.ucenter.constant.LoginConstant;
+import com.fdkankan.ucenter.entity.Camera;
+import com.fdkankan.ucenter.entity.CameraDetail;
+import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.service.ICameraDetailService;
+import com.fdkankan.ucenter.service.ICameraService;
+import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.vo.request.LoginParam;
+import com.fdkankan.ucenter.vo.request.RegisterParam;
+import com.fdkankan.ucenter.vo.response.LoginVo;
+import com.fdkankan.ucenter.vo.response.UserVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/fdkankan/user/service/impl/ReceiverInfoServiceImpl.java

@@ -1,14 +1,13 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.user.entity.ReceiverInfo;
-import com.fdkankan.user.mapper.IReceiverInfoMapper;
-import com.fdkankan.user.service.IReceiverInfoService;
+import com.fdkankan.ucenter.entity.ReceiverInfo;
+import com.fdkankan.ucenter.mapper.IReceiverInfoMapper;
+import com.fdkankan.ucenter.service.IReceiverInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.user.vo.request.ShipAddressParam;
+import com.fdkankan.ucenter.vo.request.ShipAddressParam;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/fdkankan/user/service/impl/SceneCooperationServiceImpl.java

@@ -1,15 +1,15 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.user.constant.LoginConstant;
-import com.fdkankan.user.entity.*;
-import com.fdkankan.user.mapper.ISceneCooperationMapper;
-import com.fdkankan.user.service.*;
+import com.fdkankan.ucenter.constant.LoginConstant;
+import com.fdkankan.ucenter.entity.*;
+import com.fdkankan.ucenter.mapper.ISceneCooperationMapper;
+import com.fdkankan.ucenter.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.user.vo.request.SceneCooperationParam;
+import com.fdkankan.ucenter.vo.request.SceneCooperationParam;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/fdkankan/user/service/impl/ScenePlusExtServiceImpl.java

@@ -1,9 +1,9 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fdkankan.user.entity.ScenePlusExt;
-import com.fdkankan.user.mapper.IScenePlusExtMapper;
-import com.fdkankan.user.service.IScenePlusExtService;
+import com.fdkankan.ucenter.entity.ScenePlusExt;
+import com.fdkankan.ucenter.mapper.IScenePlusExtMapper;
+import com.fdkankan.ucenter.service.IScenePlusExtService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

src/main/java/com/fdkankan/user/service/impl/ScenePlusServiceImpl.java

@@ -1,11 +1,10 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.user.entity.ScenePlus;
-import com.fdkankan.user.entity.ScenePro;
-import com.fdkankan.user.mapper.IScenePlusMapper;
-import com.fdkankan.user.service.IScenePlusService;
+import com.fdkankan.ucenter.entity.ScenePlus;
+import com.fdkankan.ucenter.mapper.IScenePlusMapper;
+import com.fdkankan.ucenter.service.IScenePlusService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

src/main/java/com/fdkankan/user/service/impl/SceneProServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,13 +7,13 @@ import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.user.entity.*;
-import com.fdkankan.user.mapper.ISceneProMapper;
-import com.fdkankan.user.service.*;
+import com.fdkankan.ucenter.entity.*;
+import com.fdkankan.ucenter.mapper.ISceneProMapper;
+import com.fdkankan.ucenter.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.user.util.DateUserUtil;
-import com.fdkankan.user.vo.response.GroupByCount;
-import com.fdkankan.user.vo.response.SceneNumVo;
+import com.fdkankan.ucenter.util.DateUserUtil;
+import com.fdkankan.ucenter.vo.response.GroupByCount;
+import com.fdkankan.ucenter.vo.response.SceneNumVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/fdkankan/user/service/impl/SceneResourceCameraServiceImpl.java

@@ -1,9 +1,9 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fdkankan.user.entity.SceneResourceCamera;
-import com.fdkankan.user.mapper.ISceneResourceCameraMapper;
-import com.fdkankan.user.service.ISceneResourceCameraService;
+import com.fdkankan.ucenter.entity.SceneResourceCamera;
+import com.fdkankan.ucenter.mapper.ISceneResourceCameraMapper;
+import com.fdkankan.ucenter.service.ISceneResourceCameraService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

src/main/java/com/fdkankan/user/service/impl/SceneResourceCooperationServiceImpl.java

@@ -1,9 +1,9 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fdkankan.user.entity.SceneResourceCooperation;
-import com.fdkankan.user.mapper.ISceneResourceCooperationMapper;
-import com.fdkankan.user.service.ISceneResourceCooperationService;
+import com.fdkankan.ucenter.entity.SceneResourceCooperation;
+import com.fdkankan.ucenter.mapper.ISceneResourceCooperationMapper;
+import com.fdkankan.ucenter.service.ISceneResourceCooperationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

src/main/java/com/fdkankan/user/service/impl/SceneResourceServiceImpl.java

@@ -1,9 +1,9 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fdkankan.user.entity.SceneResource;
-import com.fdkankan.user.mapper.ISceneResourceMapper;
-import com.fdkankan.user.service.ISceneResourceService;
+import com.fdkankan.ucenter.entity.SceneResource;
+import com.fdkankan.ucenter.mapper.ISceneResourceMapper;
+import com.fdkankan.ucenter.service.ISceneResourceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

src/main/java/com/fdkankan/user/service/impl/SceneServiceImpl.java

@@ -1,10 +1,10 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.user.entity.Scene;
-import com.fdkankan.user.mapper.ISceneMapper;
-import com.fdkankan.user.service.ISceneService;
+import com.fdkankan.ucenter.entity.Scene;
+import com.fdkankan.ucenter.mapper.ISceneMapper;
+import com.fdkankan.ucenter.service.ISceneService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

src/main/java/com/fdkankan/user/service/impl/UserIncrementServiceImpl.java

@@ -1,22 +1,21 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.util.DateUtil;
-import com.fdkankan.user.entity.Camera;
-import com.fdkankan.user.entity.User;
-import com.fdkankan.user.entity.UserIncrement;
-import com.fdkankan.user.mapper.IUserIncrementMapper;
-import com.fdkankan.user.service.ICameraService;
-import com.fdkankan.user.service.IUserIncrementService;
+import com.fdkankan.ucenter.entity.Camera;
+import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.entity.UserIncrement;
+import com.fdkankan.ucenter.mapper.IUserIncrementMapper;
+import com.fdkankan.ucenter.service.ICameraService;
+import com.fdkankan.ucenter.service.IUserIncrementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.user.service.IUserService;
-import com.fdkankan.user.vo.request.IncrementParam;
-import com.fdkankan.user.vo.response.UserIncrementVo;
+import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.vo.request.IncrementParam;
+import com.fdkankan.ucenter.vo.response.UserIncrementVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/fdkankan/user/service/impl/UserServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.service.impl;
+package com.fdkankan.ucenter.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,19 +9,19 @@ import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.common.validation.Variable;
 import com.fdkankan.fyun.qiniu.QiniuUpload;
-import com.fdkankan.user.constant.LoginConstant;
-import com.fdkankan.user.entity.ReceiverInfo;
-import com.fdkankan.user.entity.User;
-import com.fdkankan.user.mapper.IUserMapper;
-import com.fdkankan.user.service.ICameraDetailService;
-import com.fdkankan.user.service.IReceiverInfoService;
-import com.fdkankan.user.service.IUserIncrementService;
-import com.fdkankan.user.service.IUserService;
+import com.fdkankan.ucenter.constant.LoginConstant;
+import com.fdkankan.ucenter.entity.ReceiverInfo;
+import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.mapper.IUserMapper;
+import com.fdkankan.ucenter.service.ICameraDetailService;
+import com.fdkankan.ucenter.service.IReceiverInfoService;
+import com.fdkankan.ucenter.service.IUserIncrementService;
+import com.fdkankan.ucenter.service.IUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.user.vo.request.RegisterParam;
-import com.fdkankan.user.vo.request.ShipAddressParam;
-import com.fdkankan.user.vo.request.UserParam;
-import com.fdkankan.user.vo.response.UserVo;
+import com.fdkankan.ucenter.vo.request.RegisterParam;
+import com.fdkankan.ucenter.vo.request.ShipAddressParam;
+import com.fdkankan.ucenter.vo.request.UserParam;
+import com.fdkankan.ucenter.vo.response.UserVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/fdkankan/user/util/DateUserUtil.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.util;
+package com.fdkankan.ucenter.util;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/java/com/fdkankan/user/vo/request/CameraParam.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.request;
+package com.fdkankan.ucenter.vo.request;
 
 import com.fdkankan.common.request.RequestBase;
 import lombok.Data;

src/main/java/com/fdkankan/user/vo/request/FolderParam.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.request;
+package com.fdkankan.ucenter.vo.request;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/request/IncrementParam.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.request;
+package com.fdkankan.ucenter.vo.request;
 
 import com.fdkankan.common.request.RequestBase;
 import lombok.Data;

src/main/java/com/fdkankan/user/vo/request/LoginParam.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.request;
+package com.fdkankan.ucenter.vo.request;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/request/RegisterParam.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.request;
+package com.fdkankan.ucenter.vo.request;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/request/SceneCooperationParam.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.request;
+package com.fdkankan.ucenter.vo.request;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/request/ShipAddressParam.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.request;
+package com.fdkankan.ucenter.vo.request;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/request/UserParam.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.request;
+package com.fdkankan.ucenter.vo.request;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/response/CameraSpaceVo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.response;
+package com.fdkankan.ucenter.vo.response;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fdkankan.common.util.DateUtil;

src/main/java/com/fdkankan/user/vo/response/CameraVo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.response;
+package com.fdkankan.ucenter.vo.response;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/response/DataGroupByCount.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.response;
+package com.fdkankan.ucenter.vo.response;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/response/GroupByCount.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.response;
+package com.fdkankan.ucenter.vo.response;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/response/LoginVo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.response;
+package com.fdkankan.ucenter.vo.response;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/response/SceneNumVo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.response;
+package com.fdkankan.ucenter.vo.response;
 
 import lombok.Data;
 

src/main/java/com/fdkankan/user/vo/response/UserIncrementVo.java

@@ -1,6 +1,5 @@
-package com.fdkankan.user.vo.response;
+package com.fdkankan.ucenter.vo.response;
 
-import com.fdkankan.common.request.RequestBase;
 import lombok.Data;
 
 import java.util.Date;

src/main/java/com/fdkankan/user/vo/response/UserVo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.user.vo.response;
+package com.fdkankan.ucenter.vo.response;
 
 import lombok.Data;
 

src/main/resources/mapper/ucenter/CameraDetailMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.ucenter.mapper.ICameraDetailMapper">
+
+</mapper>

src/main/resources/mapper/user/CameraMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fdkankan.user.mapper.ICameraMapper">
+<mapper namespace="com.fdkankan.ucenter.mapper.ICameraMapper">
 
-    <select id="pageList" resultType="com.fdkankan.user.vo.response.CameraVo">
+    <select id="pageList" resultType="com.fdkankan.ucenter.vo.response.CameraVo">
         select c.id,c.sn_code,c.child_name ,d.balance,d.type , d.total_space,d.used_space,
         u.id as cooperationUser,u.user_name as cooperationUserName,g.pic,g.id
         from t_camera c

src/main/resources/mapper/user/CameraSpaceMapper.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fdkankan.user.mapper.ICameraSpaceMapper">
+<mapper namespace="com.fdkankan.ucenter.mapper.ICameraSpaceMapper">
 
-    <select id="getVoListByCameraId" resultType="com.fdkankan.user.vo.response.CameraSpaceVo">
+    <select id="getVoListByCameraId" resultType="com.fdkankan.ucenter.vo.response.CameraSpaceVo">
         select s.id, s.space_end_time, c.child_name, s.space from t_camera_space s
             LEFT JOIN t_camera c on s.camera_id = c.id
             where s.rec_status = 'A' and s.space_type = 2 and s.camera_id = #{cameraId} and TIMESTAMPDIFF(MINUTE, NOW(), s.space_end_time) &gt; -1
             ORDER BY s.space_end_time
     </select>
-    <select id="getVoListByCameraIds" resultType="com.fdkankan.user.vo.response.CameraSpaceVo">
+    <select id="getVoListByCameraIds" resultType="com.fdkankan.ucenter.vo.response.CameraSpaceVo">
         select s.id, s.space_end_time, c.child_name, s.space,s.camera_id from t_camera_space s
             LEFT JOIN t_camera c on s.camera_id = c.id
             where s.rec_status = 'A' and s.space_type = 2 and s.camera_id in