|
@@ -112,7 +112,7 @@ public class BrandController extends AbstractController{
|
|
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) {
|
|
- log.info("开始刷新列表..........."+System.currentTimeMillis());
|
|
|
|
|
|
+ //log.info("开始刷新列表..........."+System.currentTimeMillis());
|
|
Long userId = null;
|
|
Long userId = null;
|
|
//如果不是超级管理员,则只能查询本部门及子部门数据
|
|
//如果不是超级管理员,则只能查询本部门及子部门数据
|
|
List<Long> roleIdList = getUser().getRoleIdList();
|
|
List<Long> roleIdList = getUser().getRoleIdList();
|
|
@@ -154,7 +154,7 @@ public class BrandController extends AbstractController{
|
|
return brandRspVo;
|
|
return brandRspVo;
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
|
|
|
- log.info("结束刷新列表..........."+System.currentTimeMillis());
|
|
|
|
|
|
+ //log.info("结束刷新列表..........."+System.currentTimeMillis());
|
|
return Result.success(PageUtilsPlus.page(rspBrandList,resultPage));
|
|
return Result.success(PageUtilsPlus.page(rspBrandList,resultPage));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -226,6 +226,7 @@ public class BrandController extends AbstractController{
|
|
brandService.generalWxShareQrCode(brand , true);
|
|
brandService.generalWxShareQrCode(brand , true);
|
|
brand.setToken(token);
|
|
brand.setToken(token);
|
|
brandService.sendDataToApi(brand);
|
|
brandService.sendDataToApi(brand);
|
|
|
|
+ zhiHouseService.generateDefaultLiveRoom(params.getSceneNum(),true);
|
|
} catch (BeansException e) {
|
|
} catch (BeansException e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
return Result.failure(ObjectUtils.isEmpty(e.getMessage())?"该场景已经绑定直播间!":e.getMessage());
|
|
return Result.failure(ObjectUtils.isEmpty(e.getMessage())?"该场景已经绑定直播间!":e.getMessage());
|
|
@@ -289,7 +290,7 @@ public class BrandController extends AbstractController{
|
|
@RequiresPermissions("brand: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());
|
|
if(ObjectUtils.isEmpty(ids)){
|
|
if(ObjectUtils.isEmpty(ids)){
|
|
return Result.success();
|
|
return Result.success();
|
|
}
|
|
}
|
|
@@ -324,7 +325,7 @@ public class BrandController extends AbstractController{
|
|
}
|
|
}
|
|
|
|
|
|
brandService.deleteBatch(ids);
|
|
brandService.deleteBatch(ids);
|
|
- log.info("结束删除..........."+System.currentTimeMillis());
|
|
|
|
|
|
+ // log.info("结束删除..........."+System.currentTimeMillis());
|
|
return Result.success();
|
|
return Result.success();
|
|
}
|
|
}
|
|
|
|
|