|
@@ -78,7 +78,6 @@ public class BrandController extends AbstractController{
|
|
*/
|
|
*/
|
|
@ApiOperation(value = "用户绑定品牌")
|
|
@ApiOperation(value = "用户绑定品牌")
|
|
@PostMapping("/bindUser")
|
|
@PostMapping("/bindUser")
|
|
- @RequiresPermissions("brand:list")
|
|
|
|
public Result bindUser(@ApiParam(name = "BrandBindUserVo对象", value = "传入json格式", required = true)
|
|
public Result bindUser(@ApiParam(name = "BrandBindUserVo对象", value = "传入json格式", required = true)
|
|
@RequestBody BrandRequestVo brandRequestVo) {
|
|
@RequestBody BrandRequestVo brandRequestVo) {
|
|
if(brandRequestVo == null || brandRequestVo.getBrandId() == null){
|
|
if(brandRequestVo == null || brandRequestVo.getBrandId() == null){
|
|
@@ -96,7 +95,6 @@ public class BrandController extends AbstractController{
|
|
* 查看列表
|
|
* 查看列表
|
|
*/
|
|
*/
|
|
@GetMapping("/brandTypeList")
|
|
@GetMapping("/brandTypeList")
|
|
- @RequiresPermissions("brand:list")
|
|
|
|
public Result brandTypeList() {
|
|
public Result brandTypeList() {
|
|
Map<String , Object> map = new HashMap<>();
|
|
Map<String , Object> map = new HashMap<>();
|
|
map.put("list" , tmBrandTypeService.getAllList());
|
|
map.put("list" , tmBrandTypeService.getAllList());
|
|
@@ -109,7 +107,6 @@ public class BrandController extends AbstractController{
|
|
*/
|
|
*/
|
|
@ApiOperation(value = "店铺绑定情况列表")
|
|
@ApiOperation(value = "店铺绑定情况列表")
|
|
@GetMapping("/brandBindList")
|
|
@GetMapping("/brandBindList")
|
|
- @RequiresPermissions("brand:list")
|
|
|
|
public Result brandBindList(@RequestParam(name = "page") long page,@RequestHeader String token,
|
|
public Result brandBindList(@RequestParam(name = "page") long page,@RequestHeader String token,
|
|
@RequestParam(name = "limit") long limit,String order,String sidx,
|
|
@RequestParam(name = "limit") long limit,String order,String sidx,
|
|
String sceneName,String brandName,Integer type,Integer livestreamStatus) {
|
|
String sceneName,String brandName,Integer type,Integer livestreamStatus) {
|
|
@@ -163,7 +160,6 @@ public class BrandController extends AbstractController{
|
|
* 查看信息
|
|
* 查看信息
|
|
*/
|
|
*/
|
|
@PostMapping("/info")
|
|
@PostMapping("/info")
|
|
- @RequiresPermissions("brand:info")
|
|
|
|
public Result info(@RequestBody BrandEntity brandEntity,@RequestHeader String token) {
|
|
public Result info(@RequestBody BrandEntity brandEntity,@RequestHeader String token) {
|
|
if(ObjectUtils.isEmpty(brandEntity.getId())){
|
|
if(ObjectUtils.isEmpty(brandEntity.getId())){
|
|
return Result.failure("参数有误!");
|
|
return Result.failure("参数有误!");
|
|
@@ -186,7 +182,6 @@ public class BrandController extends AbstractController{
|
|
*/
|
|
*/
|
|
@CanUserUpdateRecord
|
|
@CanUserUpdateRecord
|
|
@RequestMapping("/save")
|
|
@RequestMapping("/save")
|
|
- @RequiresPermissions("brand:save")
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public Result save(@RequestBody BrandEntity params,@RequestHeader String token) {
|
|
public Result save(@RequestBody BrandEntity params,@RequestHeader String token) {
|
|
if(ObjectUtils.isEmpty(params.getSceneNum())){
|
|
if(ObjectUtils.isEmpty(params.getSceneNum())){
|
|
@@ -240,7 +235,6 @@ public class BrandController extends AbstractController{
|
|
*/
|
|
*/
|
|
@CanUserUpdateRecord
|
|
@CanUserUpdateRecord
|
|
@PostMapping("/update")
|
|
@PostMapping("/update")
|
|
- @RequiresPermissions("brand:update")
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public Result update(@RequestBody BrandEntity brand,@RequestHeader String token) {
|
|
public Result update(@RequestBody BrandEntity brand,@RequestHeader String token) {
|
|
if(ObjectUtils.isEmpty(brand.getId())){
|
|
if(ObjectUtils.isEmpty(brand.getId())){
|
|
@@ -288,7 +282,6 @@ public class BrandController extends AbstractController{
|
|
*/
|
|
*/
|
|
@CanUserUpdateRecord
|
|
@CanUserUpdateRecord
|
|
@RequestMapping("/delete")
|
|
@RequestMapping("/delete")
|
|
- @RequiresPermissions("brand:delete")
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public Result delete(@RequestBody Integer[] ids,@RequestHeader String token) {
|
|
public Result delete(@RequestBody Integer[] ids,@RequestHeader String token) {
|
|
//log.info("开始删除..........."+System.currentTimeMillis());
|
|
//log.info("开始删除..........."+System.currentTimeMillis());
|