clunt
/
playlet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
但星霖 2024-03-20 14:30:38 +08:00
parent 4d3b6a6a15 247d79e5cd
commit 6d7ec25905
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java
View File

@ -9,6 +9,7 @@ import com.playlet.system.domain.PlayletRevenueRecord;
import com.playlet.system.pojo.vo.RevenueRecordStatisticsVO; import com.playlet.system.pojo.vo.RevenueRecordStatisticsVO;
import com.playlet.system.service.IPlayletRevenueRecordService; import com.playlet.system.service.IPlayletRevenueRecordService;
import com.playlet.web.service.app.PlayletRevenueRecordAppService; import com.playlet.web.service.app.PlayletRevenueRecordAppService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -28,6 +29,7 @@ import java.util.List;
@Controller @Controller
@RequestMapping("/app/record") @RequestMapping("/app/record")
@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(tags = "短剧*短剧收益")
public class PlayletRevenueRecordAppController extends BaseController { public class PlayletRevenueRecordAppController extends BaseController {
private final PlayletRevenueRecordAppService service; private final PlayletRevenueRecordAppService service;

3
playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletRevenueRecordController.java
View File

@ -119,21 +119,18 @@ public class PlayletRevenueRecordController extends BaseController {
@ResponseBody @ResponseBody
@PostMapping("/statistics/time") @PostMapping("/statistics/time")
@ApiOperation(value = "短剧收益时间统计")
public Result<PlayletRevenueRecord> statisticsTime(@RequestBody PlayletRevenueRecord playletRevenueRecord) { public Result<PlayletRevenueRecord> statisticsTime(@RequestBody PlayletRevenueRecord playletRevenueRecord) {
return Result.success(playletRevenueRecordService.statisticsTime(playletRevenueRecord)); return Result.success(playletRevenueRecordService.statisticsTime(playletRevenueRecord));
} }
@ResponseBody @ResponseBody
@PostMapping("/statistics") @PostMapping("/statistics")
@ApiOperation(value = "短剧收益统计")
public Result<RevenueRecordStatisticsVO> statistics(@RequestBody PlayletRevenueRecord playletRevenueRecord) { public Result<RevenueRecordStatisticsVO> statistics(@RequestBody PlayletRevenueRecord playletRevenueRecord) {
return Result.success(playletRevenueRecordService.statistics(playletRevenueRecord)); return Result.success(playletRevenueRecordService.statistics(playletRevenueRecord));
} }
@ResponseBody @ResponseBody
@PostMapping("/statistics/time/type") @PostMapping("/statistics/time/type")
@ApiOperation(value = "短剧收益时间统计分类")
public Result<List<PlayletRevenueRecord>> statisticsTimeType(@RequestBody PlayletRevenueRecord playletRevenueRecord) { public Result<List<PlayletRevenueRecord>> statisticsTimeType(@RequestBody PlayletRevenueRecord playletRevenueRecord) {
return Result.success(playletRevenueRecordService.statisticsTimeType(playletRevenueRecord)); return Result.success(playletRevenueRecordService.statisticsTimeType(playletRevenueRecord));
} }

3
playlet-system/src/main/java/com/playlet/system/domain/PlayletItemType.java
View File

@ -1,5 +1,7 @@
package com.playlet.system.domain; package com.playlet.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.playlet.common.core.domain.BaseEntity; import com.playlet.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@ -20,6 +22,7 @@ public class PlayletItemType extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 剧场id */ /** 剧场id */
@TableId(value = "id", type = IdType.AUTO)
private Long id; private Long id;
/** 剧场名称 */ /** 剧场名称 */

3
playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java
View File

@ -1,6 +1,8 @@
package com.playlet.system.domain; package com.playlet.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.playlet.common.core.domain.BaseEntity; import com.playlet.common.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -27,6 +29,7 @@ public class PlayletRevenueRecord extends BaseEntity {
* 短剧任务收益主键id * 短剧任务收益主键id
*/ */
@ApiModelProperty(value = "id?") @ApiModelProperty(value = "id?")
@TableId(value = "id", type = IdType.AUTO)
private Long id; private Long id;
/** /**