Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/entity/Camera.java

src/main/java/com/fdkankan/ucenter/controller/DeviceSceneController.java

@@ -0,0 +1,51 @@
+package com.fdkankan.ucenter.controller;
+
+import com.fdkankan.ucenter.common.BaseController;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.IScenePlusService;
+import com.fdkankan.ucenter.service.impl.AppSceneService;
+import com.fdkankan.ucenter.vo.request.AppSceneParam;
+import com.fdkankan.ucenter.vo.request.DeviceListParam;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 设备中心接口
+ */
+@Log4j2
+/**设备中心接口-场景模块*/
+@RestController
+@RequestMapping("/device/scene")
+public class DeviceSceneController extends BaseController {
+
+    @Autowired
+    AppSceneService appSceneService;
+
+    /**
+     * 获取相机场景记录
+     * @param param
+     * @return
+     */
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result getScenes(@RequestBody AppSceneParam param) throws Exception {
+        param.setCameraType(null);
+        return Result.success(appSceneService.pageList(param));
+    }
+
+    /**
+     * 删除场景
+     * @return
+     */
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public Result deleteScene(@RequestBody AppSceneParam param) throws Exception {
+        param.setCameraType(null);
+        appSceneService.deleteScene(param.getSceneNum());
+        return Result.success();
+    }
+
+
+}

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

@@ -6,6 +6,7 @@ import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.entity.UserIncrement;
 import com.fdkankan.ucenter.service.IIncrementTypeService;
 import com.fdkankan.ucenter.service.IUserIncrementService;
+import com.fdkankan.ucenter.util.DateUserUtil;
 import com.fdkankan.ucenter.vo.request.IncrementParam;
 import com.fdkankan.ucenter.vo.response.ResponseUserIncrement;
 import org.apache.commons.lang3.StringUtils;
@@ -64,9 +65,10 @@ public class IncrementController {
         UserIncrement userIncrementEntity = userIncrementService.getById(param.getId());
         ResponseUserIncrement responseUserIncrement = new ResponseUserIncrement();
         BeanUtils.copyProperties(userIncrementEntity, responseUserIncrement);
-        responseUserIncrement.setIncrementStartStr(DateUtil.date2String(responseUserIncrement.getIncrementStartTime(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
-        responseUserIncrement.setIncrementEndStr(DateUtil.date2String(responseUserIncrement.getIncrementEndTime(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
-        responseUserIncrement.setCreateStr(DateUtil.date2String(responseUserIncrement.getCreateTime(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
+
+        responseUserIncrement.setIncrementStartStr(DateUserUtil.getDayTime(responseUserIncrement.getIncrementStartTime()));
+        responseUserIncrement.setIncrementEndStr(DateUserUtil.getDayTime(responseUserIncrement.getIncrementEndTime()));
+        responseUserIncrement.setCreateStr(DateUserUtil.getDayTime(responseUserIncrement.getCreateTime()));
         return Result.success(userIncrementEntity);
     }
 }

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

@@ -2,11 +2,14 @@ package com.fdkankan.ucenter.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.ucenter.common.RedisKeyUtil;
 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.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -19,7 +22,10 @@ public class LoginController {
 
     @Autowired
     LoginService loginService;
-
+    @Autowired
+    RedisUtil redisUtil;
+    @Value("${spring.profiles.active}")
+    private String environment;
     /**
      * 登录
      * phoneNum 用户名
@@ -136,5 +142,26 @@ public class LoginController {
     public Result getToken(@RequestBody LoginParam param){
         return Result.success(loginService.login(param));
     }
+
+
+    /**
+     *  测试使用 获取具体验证码
+     * @param user
+     * @return
+     */
+    @RequestMapping(value = "/findMsgAuthCode", method = RequestMethod.POST)
+    public Result findMsgAuthCode(@RequestBody LoginParam user) {
+
+        String redisKey = RedisKeyUtil.PREFIX_MSG_AUTH_CODE +user.getPhoneNum();
+        if(!"prod".equals(environment)){
+            return Result.success(redisUtil.get(redisKey));
+        }
+
+        if("18819272208".equals(user.getPhoneNum()) || "12369874542".equals(user.getPhoneNum())){
+            return Result.success(redisUtil.get(redisKey));
+        }
+
+        return Result.success();
+    }
 }
 

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

@@ -83,4 +83,5 @@ public class Camera implements Serializable {
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
+
 }

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

@@ -59,7 +59,7 @@ public class AppSceneService {
     private String ossHost;
 
     public PageInfo pageList(AppSceneParam param) {
-        if(StringUtils.isEmpty(param.getAppUserName()) && StringUtils.isEmpty(param.getPhoneNum()) ){
+        if(StringUtils.isEmpty(param.getAppUserName()) && StringUtils.isEmpty(param.getPhoneNum()) && param.getCameraId() == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
         if(!StringUtils.isEmpty(param.getAppUserName()) && !StringUtils.isEmpty(param.getAppPassword())){
@@ -267,4 +267,8 @@ public class AppSceneService {
         }
         sceneProService.deleteByList(proList,plusList);
     }
+
+    public void deleteScene(String sceneNum) {
+        sceneProService.delete(sceneNum);
+    }
 }

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

@@ -293,9 +293,10 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public Object findCameraDetailByChildName(String token, String childName) {
-        User user = this.getByToken(token);
+        User userVo = this.getByToken(token);
         CameraVo cameraVo = cameraService.getVoByChildName(childName);
-        if(user != null){
+        if(userVo != null && userVo.getId()!= null){
+            User user = this.getById(userVo.getId());
             cameraVo.setNickName(user.getNickName());
         }else {
             if(cameraVo.getType().equals(9)){

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

@@ -61,4 +61,5 @@ public class DateUserUtil {
         Date date2 = DateUserUtil.getDate(getLastDate());
         return ( date2.getTime() - date1.getTime() ) /1000;
     }
+
 }

src/main/java/com/fdkankan/ucenter/vo/request/AppSceneParam.java

@@ -24,4 +24,13 @@ public class AppSceneParam extends RequestBase {
 
     private String orderBy;
 
+
+    private String searchKey;
+    private String startTime;
+    private String endTime;
+    private String sceneNum;
+    public String getSceneName() {
+        return searchKey;
+    }
+
 }

src/main/java/com/fdkankan/ucenter/vo/request/DeviceListParam.java

@@ -0,0 +1,23 @@
+package com.fdkankan.ucenter.vo.request;
+
+import com.fdkankan.ucenter.common.RequestBase;
+import lombok.Data;
+
+@Data
+public class DeviceListParam extends RequestBase {
+
+    private Integer cameraType;
+    private Integer cameraId;
+    private String startTime;
+    private String endTime;
+    private String sceneType;
+    private String searchKey;
+    private Integer isUpgrade;
+
+    private String sceneName;
+
+    public String getSceneName() {
+        return searchKey;
+    }
+
+}

src/main/java/com/fdkankan/ucenter/vo/response/AppSceneVo.java

@@ -34,6 +34,8 @@ public class AppSceneVo {
     private String dataSource;
     private Integer sceneType;
 
+    private String buildType;
+
     public String getCreateTime() {
         return DateUserUtil.getDayTime(createTime);
     }

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

@@ -54,5 +54,7 @@ public class CameraVo {
     /**"昵称", name = "nickName*/
     private String nickName;
 
+    private Integer own;
+
     private  ResponseUserIncrement responseUserIncrement;
 }

src/main/java/com/fdkankan/ucenter/vo/response/ResponseUserIncrement.java

@@ -24,16 +24,16 @@ public class ResponseUserIncrement extends RequestBase {
     /**
      * 生效时间
      */
-    private Date incrementStartTime;
+    private String incrementStartTime;
     /**
      * 结束时间
      */
-    private Date incrementEndTime;
+    private String incrementEndTime;
 
     /**
      * 创建时间
      */
-    private Date createTime;
+    private String createTime;
 
     private String snCode;
 

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

@@ -5,7 +5,8 @@
     <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
+            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.ucenter.vo.response.CameraSpaceVo">

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

@@ -5,7 +5,7 @@
     <select id="pageList" resultType="com.fdkankan.ucenter.vo.response.AppSceneVo">
         SELECT p.id ,null as name ,0 as isFolder,null as type,null as parentId ,p.create_time,num,scene_name,scene_dec,
         p.status,pay_status,thumb,web_site,0 as is_upgrade,view_count,
-         p.camera_id,p.user_id ,p.data_source,p.scene_type
+         p.camera_id,p.user_id ,p.data_source,p.scene_type,build_type
         FROM t_scene_pro p
         <include refid="sceneJoinCamera"></include>
         WHERE is_upgrade = 0 and  p.rec_status = 'A'   AND ( p.status = 1 OR p.status = -2) AND p.scene_type != 99
@@ -16,7 +16,7 @@
         UNION
         SELECT p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,p.create_time ,num,title as scene_name,description as scene_dec,
         scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,view_count,
-        p.camera_id,p.user_id,e.data_source,p.scene_type
+        p.camera_id,p.user_id,e.data_source,p.scene_type,build_type
         FROM t_scene_plus p
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         <include refid="sceneJoinCamera"></include>