|
@@ -4,6 +4,8 @@ import com.fdkankan.common.util.DateUtil;
|
|
|
import com.fdkankan.common.util.JwtUtil;
|
|
|
import com.fdkankan.ucenter.common.BaseController;
|
|
|
import com.fdkankan.ucenter.common.Result;
|
|
|
+import com.fdkankan.ucenter.common.constants.NacosProperty;
|
|
|
+import com.fdkankan.ucenter.entity.IncrementType;
|
|
|
import com.fdkankan.ucenter.entity.UserIncrement;
|
|
|
import com.fdkankan.ucenter.service.IIncrementTypeService;
|
|
|
import com.fdkankan.ucenter.service.IUserIncrementService;
|
|
@@ -15,6 +17,8 @@ import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import java.util.List;
|
|
|
+
|
|
|
@RestController
|
|
|
@RequestMapping("/ucenter/user/increment")
|
|
|
public class IncrementController extends BaseController {
|
|
@@ -26,7 +30,13 @@ public class IncrementController extends BaseController {
|
|
|
|
|
|
@GetMapping("/getIncrementType")
|
|
|
public Result getIncrementType(){
|
|
|
- return Result.success(incrementTypeService.list());
|
|
|
+ List<IncrementType> list = incrementTypeService.list();
|
|
|
+ if("aws".equals(NacosProperty.uploadType)){
|
|
|
+ for (IncrementType incrementType : list) {
|
|
|
+ incrementType.setCameraCapacity(incrementType.getCameraSpace());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return Result.success(list);
|
|
|
}
|
|
|
|
|
|
@PostMapping("/findIncrementList")
|