From e0d68aa159603be0f0f8a3c19739859f50d29d7a Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Tue, 19 Mar 2024 10:12:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=84=E5=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/playlet/system/domain/PlayletItemType.java | 3 +++ .../java/com/playlet/system/domain/PlayletRevenueRecord.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletItemType.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletItemType.java index 898b5e4..7d60902 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletItemType.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletItemType.java @@ -1,5 +1,7 @@ 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.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -20,6 +22,7 @@ public class PlayletItemType extends BaseEntity private static final long serialVersionUID = 1L; /** 剧场id */ + @TableId(value = "id", type = IdType.AUTO) private Long id; /** 剧场名称 */ diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java index 4d38f51..9b7b8b2 100644 --- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java +++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletRevenueRecord.java @@ -1,6 +1,8 @@ package com.playlet.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.playlet.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -27,6 +29,7 @@ public class PlayletRevenueRecord extends BaseEntity { * 短剧任务收益主键id */ @ApiModelProperty(value = "id?") + @TableId(value = "id", type = IdType.AUTO) private Long id; /** From d1c8bd6e2c398ee07f18294ddff6fabdcd0872c1 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Tue, 19 Mar 2024 13:37:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?swagger=20=E8=A7=84=E8=8C=83=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/PlayletRevenueRecordAppController.java | 2 ++ .../web/controller/system/PlayletRevenueRecordController.java | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java index 368f637..d267679 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/app/PlayletRevenueRecordAppController.java @@ -9,6 +9,7 @@ import com.playlet.system.domain.PlayletRevenueRecord; import com.playlet.system.pojo.vo.RevenueRecordStatisticsVO; import com.playlet.system.service.IPlayletRevenueRecordService; import com.playlet.web.service.app.PlayletRevenueRecordAppService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -28,6 +29,7 @@ import java.util.List; @Controller @RequestMapping("/app/record") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) +@Api(tags = "短剧*短剧收益") public class PlayletRevenueRecordAppController extends BaseController { private final PlayletRevenueRecordAppService service; diff --git a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletRevenueRecordController.java b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletRevenueRecordController.java index c314f17..40ebb5d 100644 --- a/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletRevenueRecordController.java +++ b/playlet-admin/src/main/java/com/playlet/web/controller/system/PlayletRevenueRecordController.java @@ -119,21 +119,18 @@ public class PlayletRevenueRecordController extends BaseController { @ResponseBody @PostMapping("/statistics/time") - @ApiOperation(value = "短剧收益时间统计") public Result statisticsTime(@RequestBody PlayletRevenueRecord playletRevenueRecord) { return Result.success(playletRevenueRecordService.statisticsTime(playletRevenueRecord)); } @ResponseBody @PostMapping("/statistics") - @ApiOperation(value = "短剧收益统计") public Result statistics(@RequestBody PlayletRevenueRecord playletRevenueRecord) { return Result.success(playletRevenueRecordService.statistics(playletRevenueRecord)); } @ResponseBody @PostMapping("/statistics/time/type") - @ApiOperation(value = "短剧收益时间统计分类") public Result> statisticsTimeType(@RequestBody PlayletRevenueRecord playletRevenueRecord) { return Result.success(playletRevenueRecordService.statisticsTimeType(playletRevenueRecord)); } From 247d79e5cda22d79e730fb2f2fa391782c998243 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Wed, 20 Mar 2024 09:57:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=20fix=20+=20=E8=A1=A8=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E6=9C=AA=E6=B7=BB=E5=8A=A0=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/system/PlayletRevenueRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml index 3a85cac..d53df23 100644 --- a/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml +++ b/playlet-system/src/main/resources/mapper/system/PlayletRevenueRecordMapper.xml @@ -48,7 +48,7 @@ and push_time #{endTime} - guog + and item_type = #{itemType}