diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/MaterialApi.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/MaterialApi.java index ec3a44d8..ebe5528c 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/MaterialApi.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/MaterialApi.java @@ -73,9 +73,6 @@ public interface MaterialApi { /** * 根据广告位编码(bannerCode)查询素材 *
- * 对于cms和cmp需要传入当前登录人所在的workspaceId,ouId和所担任的jobCode - *
- ** 1. 通过广告位code获取该广告位下的所有素材(默认查询上架状态且在有效期范围内的素材) * 2. 根据广告位投放人群进行过滤 * 3. 根据广告位投放规则频次进行过滤 diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/DetailBannerResp.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/DetailBannerResp.java index e534b7d0..b1c4e18f 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/DetailBannerResp.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/DetailBannerResp.java @@ -8,6 +8,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.sql.Time; + /** * @author chenwenjian * @version 1.0 @@ -44,11 +46,11 @@ public class DetailBannerResp extends PageBannerResp { /** * 展示时间段-开始时间 */ - private String startTime; + private Time startTime; /** * 展示时间段-结束时间 */ - private String endTime; + private Time endTime; } diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/MaterialResp.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/MaterialResp.java index fbdd46a2..2e44a4be 100644 --- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/MaterialResp.java +++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/MaterialResp.java @@ -3,6 +3,7 @@ package cn.axzo.nanopart.api.response; import cn.axzo.nanopart.api.enums.MaterialDisplayFrequencyTypeEnum; import cn.axzo.nanopart.api.enums.MaterialTargetUserTypeEnum; import cn.axzo.nanopart.api.enums.MaterialTypeEnum; +import cn.axzo.nanopart.api.enums.PlatformTypeEnum; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; @@ -12,6 +13,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.Date; import java.util.List; /** @@ -111,4 +113,18 @@ public class MaterialResp extends PageMaterialResp { */ private Long updateBy; + /** + * 所属终端,取值:CMS:安心筑CMS,CM,CMP:安心筑工人端APP,安心筑管理端APP + *
+ * 素材 + *
+ * {@link PlatformTypeEnum} + */ + private PlatformTypeEnum terminal; + + /** + * 创建时间 + */ + protected Date createAt; + } diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerServiceImpl.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerServiceImpl.java index 0b0e869c..223d2a66 100644 --- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerServiceImpl.java +++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/BannerServiceImpl.java @@ -233,11 +233,14 @@ public class BannerServiceImpl extends ServiceImpl