Merge remote-tracking branch 'origin/master'

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

@@ -1,11 +1,15 @@
 package com.fdkankan.ucenter.controller;
 
+import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.JwtUtil;
 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.vo.request.IncrementParam;
+import com.fdkankan.ucenter.vo.response.ResponseUserIncrement;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -50,4 +54,19 @@ public class IncrementController {
         userIncrementService.unbindCamera(param);
         return Result.success();
     }
+
+    /**
+     * 根据id查询权益信息
+     */
+    @RequestMapping(value = "/findById", method = RequestMethod.POST)
+    public Result findById(@RequestBody IncrementParam param) throws Exception{
+
+        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));
+        return Result.success(userIncrementEntity);
+    }
 }

src/main/java/com/fdkankan/ucenter/controller/app/AppCameraController.java

@@ -21,7 +21,7 @@ public class AppCameraController {
     @PostMapping("/getCamerasForUser")
     public Result getCamerasForUser(@RequestBody JSONObject param ){
         String userName = param.get("userName") == null ? null : param.getString("userName");
-        Integer cameraType = param.get("cameraType") == null ? null : param.getInteger("cameraType");
+        Integer cameraType = param.get("cameraType") == null ? 4 : param.getInteger("cameraType");
 
         return Result.success(appCameraService.getCameraForUser(userName,cameraType));
     }