فهرست منبع

测试使用接口

lyhzzz 2 سال پیش
والد
کامیت
b3c3619e5b

+ 49 - 0
src/main/java/com/fdkankan/ucenter/controller/DeviceSceneController.java

@@ -0,0 +1,49 @@
+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 {
+        return Result.success(appSceneService.pageList(param));
+    }
+
+    /**
+     * 删除场景
+     * @return
+     */
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public Result deleteScene(@RequestBody AppSceneParam param) throws Exception {
+        appSceneService.deleteScene(param.getSceneNum());
+        return Result.success();
+    }
+
+
+}

+ 28 - 1
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();
+    }
 }
 

+ 4 - 0
src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -267,4 +267,8 @@ public class AppSceneService {
         }
         sceneProService.deleteByList(proList,plusList);
     }
+
+    public void deleteScene(String sceneNum) {
+        sceneProService.delete(sceneNum);
+    }
 }

+ 9 - 0
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;
+    }
+
 }

+ 23 - 0
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/resources/bootstrap-pro.yml → src/main/resources/bootstrap-prod.yml