看房需求-准备联调

4dkankan-common/src/main/java/com/fdkankan/common/model/ViewResult.java

@@ -13,7 +13,10 @@ import org.springframework.http.HttpStatus;
 @Data
 public class ViewResult<T> {
 
-    @ApiModelProperty("返回码")
+    @ApiModelProperty("http状态码")
+    private Integer status;
+
+    @ApiModelProperty(value = "返回码", name = "0和1")
     private Integer code;
 
     @ApiModelProperty("返回说明")
@@ -30,39 +33,41 @@ public class ViewResult<T> {
         this.code = code;
     }
 
-    public ViewResult(Integer code, String msg) {
+    public ViewResult(Integer status, Integer code, String msg) {
+        this.status = status;
         this.code = code;
         this.msg = msg;
     }
 
-    public ViewResult(Integer code, String msg, T data) {
+    public ViewResult(Integer status, Integer code, String msg, T data) {
+        this.status = status;
         this.code = code;
         this.msg = msg;
         this.data = data;
     }
 
     public static ViewResult success() {
-        return new ViewResult(HttpStatus.OK.value(), "操作成功");
+        return new ViewResult(HttpStatus.OK.value(), 0,"操作成功");
     }
 
     public static ViewResult success(Object data) {
-        return new ViewResult(HttpStatus.OK.value(), "成功", data);
+        return new ViewResult(HttpStatus.OK.value(), 0, "成功", data);
     }
 
     public static ViewResult success(Integer code, String msg, Object data) {
-        return new ViewResult(code, msg, data);
+        return new ViewResult(code, 0, msg, data);
     }
 
-    public static ViewResult success(Integer code, String msg) {
-        return new ViewResult(code, msg);
+    public static ViewResult success(Integer status, Integer code, String msg) {
+        return new ViewResult(HttpStatus.OK.value(), 0, msg);
     }
 
     public static ViewResult error(String msg) {
-        return new ViewResult(500, msg);
+        return new ViewResult(HttpStatus.INTERNAL_SERVER_ERROR.value(), 1, msg);
     }
 
     public static ViewResult error(Integer code, String msg) {
-        return new ViewResult(code, msg);
+        return new ViewResult(HttpStatus.INTERNAL_SERVER_ERROR.value(), 1, msg);
     }
 
 }

4dkankan-scene/src/main/java/com/fdkankan/scene/param/scene/DownloadVideoParam.java

@@ -22,7 +22,7 @@ public class DownloadVideoParam {
 //    @NotBlank(message = "fileName不能为空")
     private String fileName;
 
-    @ApiModelProperty("planIdn")
+    @ApiModelProperty("planId")
 //    @NotBlank(message = "planId不能为空")
     private String planId;
 

4dkankan-web/src/main/java/com/fdkankan/web/controller/SceneController.java

@@ -560,7 +560,9 @@ public class SceneController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "用户token", dataType = "String", required = true),
             @ApiImplicitParam(name = "num", value = "场景码", dataType = "String", required = true)})
-    public ViewResult isLogin(@RequestParam String token, @RequestParam String num) throws Exception{
+    public ViewResult isLogin(HttpServletRequest request) throws Exception{
+        String num = request.getParameter("num");
+        String token = request.getHeader("token");
         if(StringUtil.isEmpty(num) ){
             throw new BaseRuntimeException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
@@ -585,7 +587,7 @@ public class SceneController extends BaseController {
         }
 
         if("admin".equals(ssoUser.getString("roleKey")) || "group".equals(ssoUser.getString("roleKey"))){
-            return ViewResult.success();
+            return ViewResult.success(sceneProEntity.getStatus());
         }
 
         if(StringUtils.isEmpty(sceneProEntity.getDepartmentId()) ||
@@ -668,11 +670,9 @@ public class SceneController extends BaseController {
 
     @ApiOperation("根据场景码数组查询符合的场景")
     @RequestMapping(value = "/listScenesInNums", method = RequestMethod.POST)
-    public ViewResult<SceneProEntity> listScenesInNums(List<String> nums) throws Exception{
-        CameraEntity entity = null;
+    public ViewResult<SceneProEntity> listScenesInNums(@RequestBody List<String> nums) throws Exception{
         Condition condition = new Condition(SceneProEntity.class);
         condition.createCriteria().andIn("num", nums);
-        List<CameraEntity> cameraEntityList = cameraService.findAll(condition);
         List<SceneProEntity> scenes = sceneProService.findAll(condition);
         return ViewResult.success(scenes);
     }