|
@@ -7,6 +7,7 @@ import com.fs.common.core.page.TableDataInfo;
|
|
|
import com.fs.common.enums.BusinessType;
|
|
import com.fs.common.enums.BusinessType;
|
|
|
import com.fs.common.utils.poi.ExcelUtil;
|
|
import com.fs.common.utils.poi.ExcelUtil;
|
|
|
import com.fs.core.security.LoginUser;
|
|
import com.fs.core.security.LoginUser;
|
|
|
|
|
+import com.fs.core.security.SecurityUtils;
|
|
|
import com.fs.core.web.service.TokenService;
|
|
import com.fs.core.web.service.TokenService;
|
|
|
import com.fs.live.domain.LiveData;
|
|
import com.fs.live.domain.LiveData;
|
|
|
import com.fs.live.service.ILiveDataService;
|
|
import com.fs.live.service.ILiveDataService;
|
|
@@ -37,7 +38,7 @@ public class LiveDataController extends BaseController
|
|
|
/**
|
|
/**
|
|
|
* 查询直播数据列表
|
|
* 查询直播数据列表
|
|
|
*/
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('liveData:liveData:list')")
|
|
|
|
|
|
|
+// @PreAuthorize("@ss.hasPermi('liveData:liveData:list')")
|
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
|
public TableDataInfo list(LiveData liveData)
|
|
public TableDataInfo list(LiveData liveData)
|
|
|
{
|
|
{
|
|
@@ -49,7 +50,7 @@ public class LiveDataController extends BaseController
|
|
|
/**
|
|
/**
|
|
|
* 导出直播数据列表
|
|
* 导出直播数据列表
|
|
|
*/
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('liveData:liveData:export')")
|
|
|
|
|
|
|
+// @PreAuthorize("@ss.hasPermi('liveData:liveData:export')")
|
|
|
@Log(title = "直播数据", businessType = BusinessType.EXPORT)
|
|
@Log(title = "直播数据", businessType = BusinessType.EXPORT)
|
|
|
@GetMapping("/export")
|
|
@GetMapping("/export")
|
|
|
public AjaxResult export(LiveData liveData)
|
|
public AjaxResult export(LiveData liveData)
|
|
@@ -62,7 +63,7 @@ public class LiveDataController extends BaseController
|
|
|
/**
|
|
/**
|
|
|
* 获取直播数据详细信息
|
|
* 获取直播数据详细信息
|
|
|
*/
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('liveData:liveData:query')")
|
|
|
|
|
|
|
+// @PreAuthorize("@ss.hasPermi('liveData:liveData:query')")
|
|
|
@GetMapping(value = "/{liveId}")
|
|
@GetMapping(value = "/{liveId}")
|
|
|
public AjaxResult getInfo(@PathVariable("liveId") Long liveId)
|
|
public AjaxResult getInfo(@PathVariable("liveId") Long liveId)
|
|
|
{
|
|
{
|
|
@@ -72,7 +73,7 @@ public class LiveDataController extends BaseController
|
|
|
/**
|
|
/**
|
|
|
* 新增直播数据
|
|
* 新增直播数据
|
|
|
*/
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('liveData:liveData:add')")
|
|
|
|
|
|
|
+// @PreAuthorize("@ss.hasPermi('liveData:liveData:add')")
|
|
|
@Log(title = "直播数据", businessType = BusinessType.INSERT)
|
|
@Log(title = "直播数据", businessType = BusinessType.INSERT)
|
|
|
@PostMapping
|
|
@PostMapping
|
|
|
public AjaxResult add(@RequestBody LiveData liveData)
|
|
public AjaxResult add(@RequestBody LiveData liveData)
|
|
@@ -83,7 +84,7 @@ public class LiveDataController extends BaseController
|
|
|
/**
|
|
/**
|
|
|
* 修改直播数据
|
|
* 修改直播数据
|
|
|
*/
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('liveData:liveData:edit')")
|
|
|
|
|
|
|
+// @PreAuthorize("@ss.hasPermi('liveData:liveData:edit')")
|
|
|
@Log(title = "直播数据", businessType = BusinessType.UPDATE)
|
|
@Log(title = "直播数据", businessType = BusinessType.UPDATE)
|
|
|
@PutMapping
|
|
@PutMapping
|
|
|
public AjaxResult edit(@RequestBody LiveData liveData)
|
|
public AjaxResult edit(@RequestBody LiveData liveData)
|
|
@@ -94,7 +95,7 @@ public class LiveDataController extends BaseController
|
|
|
/**
|
|
/**
|
|
|
* 删除直播数据
|
|
* 删除直播数据
|
|
|
*/
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('liveData:liveData:remove')")
|
|
|
|
|
|
|
+// @PreAuthorize("@ss.hasPermi('liveData:liveData:remove')")
|
|
|
@Log(title = "直播数据", businessType = BusinessType.DELETE)
|
|
@Log(title = "直播数据", businessType = BusinessType.DELETE)
|
|
|
@DeleteMapping("/{liveIds}")
|
|
@DeleteMapping("/{liveIds}")
|
|
|
public AjaxResult remove(@PathVariable Long[] liveIds)
|
|
public AjaxResult remove(@PathVariable Long[] liveIds)
|
|
@@ -105,20 +106,20 @@ public class LiveDataController extends BaseController
|
|
|
/**
|
|
/**
|
|
|
* 直播数据页面近期直播卡片数据
|
|
* 直播数据页面近期直播卡片数据
|
|
|
*/
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('liveData:liveData:recentLive')")
|
|
|
|
|
|
|
+// @PreAuthorize("@ss.hasPermi('liveData:liveData:recentLive')")
|
|
|
@GetMapping("/recentLive")
|
|
@GetMapping("/recentLive")
|
|
|
public AjaxResult recentLive(){
|
|
public AjaxResult recentLive(){
|
|
|
- return AjaxResult.success(liveDataService.getRecentLive());
|
|
|
|
|
|
|
+ return AjaxResult.success(liveDataService.getCompanyRecentLive(SecurityUtils.getLoginUser().getCompany().getCompanyId()));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 查询直播top榜数据
|
|
* 查询直播top榜数据
|
|
|
*/
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('liveData:liveData:getLiveTop')")
|
|
|
|
|
|
|
+// @PreAuthorize("@ss.hasPermi('liveData:liveData:getLiveTop')")
|
|
|
@GetMapping("/getLiveTop")
|
|
@GetMapping("/getLiveTop")
|
|
|
public AjaxResult getLiveTop(String rankType){
|
|
public AjaxResult getLiveTop(String rankType){
|
|
|
System.out.println(rankType);
|
|
System.out.println(rankType);
|
|
|
- return AjaxResult.success(liveDataService.getLiveTop(rankType));
|
|
|
|
|
|
|
+ return AjaxResult.success(liveDataService.getCompanyLiveTop(rankType, SecurityUtils.getLoginUser().getCompany().getCompanyId()));
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|
|
|
* 查询直播趋势数据
|
|
* 查询直播趋势数据
|
|
@@ -126,13 +127,13 @@ public class LiveDataController extends BaseController
|
|
|
* @param
|
|
* @param
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('liveData:liveData:getTrendData')")
|
|
|
|
|
|
|
+// @PreAuthorize("@ss.hasPermi('liveData:liveData:getTrendData')")
|
|
|
@PostMapping("/getTrendData")
|
|
@PostMapping("/getTrendData")
|
|
|
public AjaxResult getTrendData(@RequestBody Map<String,String> queryParams) {
|
|
public AjaxResult getTrendData(@RequestBody Map<String,String> queryParams) {
|
|
|
String type = queryParams.get("type");
|
|
String type = queryParams.get("type");
|
|
|
String date = queryParams.get("date");
|
|
String date = queryParams.get("date");
|
|
|
String category = queryParams.get("category");
|
|
String category = queryParams.get("category");
|
|
|
- return AjaxResult.success(liveDataService.getTrendData(type, date,category));
|
|
|
|
|
|
|
+ return AjaxResult.success(liveDataService.getCompanyTrendData(type, date,category, SecurityUtils.getLoginUser().getCompany().getCompanyId()));
|
|
|
}
|
|
}
|
|
|
/*@PreAuthorize("@ss.hasPermi('liveData:liveData:columns')")
|
|
/*@PreAuthorize("@ss.hasPermi('liveData:liveData:columns')")
|
|
|
@GetMapping("/columns")
|
|
@GetMapping("/columns")
|