From a52609850de06b478396f1a752294401069a3519 Mon Sep 17 00:00:00 2001 From: YuChengLong <18745062429@163.com> Date: Tue, 10 May 2022 15:07:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E4=BB=BB=E5=8A=A1=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Maven__org_mongodb_bson_3_6_4.xml | 13 --- ...aven__org_mongodb_mongodb_driver_3_6_4.xml | 13 --- ..._org_mongodb_mongodb_driver_core_3_6_4.xml | 13 --- ...oot_starter_data_mongodb_2_0_8_RELEASE.xml | 13 --- ...ata_spring_data_mongodb_2_0_13_RELEASE.xml | 13 --- .../1067-yuexiu-task-model-mybatis.iml | 1 - .../1068-yexiu-read-model-mybatis.iml | 22 ++--- 1068-yexiu-read-model-mybatis/pom.xml | 8 +- .../model/dao/ArticlePreviewContentDao.java | 11 +++ .../read/model/dao/ArticlePreviewDao.java | 4 +- .../model/dao/ArticlePreviewProjectDao.java | 11 +++ .../model/dao/ArticlePreviewSpreadDao.java | 11 +++ .../entities/ArticlePreviewContentEntity.java | 30 +++++++ .../model/entities/ArticlePreviewEntity.java | 88 +++++++++++++++++++ .../entities/ArticlePreviewProjectEntity.java | 38 ++++++++ .../entities/ArticlePreviewSpreadEntity.java | 34 +++++++ .../read/model/entities/CostUnitEntity.java | 2 +- .../entities/readonly/ArticlePreview.java | 48 ---------- ...1069-yuexiu-registration-model-mybatis.iml | 1 - .../2067-yuexiu-task-application.iml | 1 - .../secp/read/dto/ArticlePreviewDto.java | 69 ++++++++++++--- .../yuexiu/secp/read/dto/RecommendDto.java | 21 +++++ .../2068-yexiu-read-application.iml | 8 +- .../controller/ArticlePreviewController.java | 38 ++++++-- .../read/model/service/IArticlePreview.java | 17 ++++ .../model/service/IArticlePreviewService.java | 11 --- ...Service.java => ArticlePreviewServer.java} | 42 +++++++-- .../main/resources/application-yuexiu2068.yml | 10 +-- .../src/main/resources/application.properties | 7 +- .../2069-yuexiu-registration-application.iml | 1 - 30 files changed, 404 insertions(+), 195 deletions(-) delete mode 100644 .idea/libraries/Maven__org_mongodb_bson_3_6_4.xml delete mode 100644 .idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml delete mode 100644 .idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_13_RELEASE.xml create mode 100644 1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewContentDao.java create mode 100644 1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewProjectDao.java create mode 100644 1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewSpreadDao.java create mode 100644 1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewContentEntity.java create mode 100644 1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewEntity.java create mode 100644 1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewProjectEntity.java create mode 100644 1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewSpreadEntity.java delete mode 100644 1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/ArticlePreview.java create mode 100644 2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/RecommendDto.java create mode 100644 2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IArticlePreview.java delete mode 100644 2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IArticlePreviewService.java rename 2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/{ArticlePreviewService.java => ArticlePreviewServer.java} (64%) diff --git a/.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml b/.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml deleted file mode 100644 index 50bf633..0000000 --- a/.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml deleted file mode 100644 index 95a778a..0000000 --- a/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml deleted file mode 100644 index 4eab0d2..0000000 --- a/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_8_RELEASE.xml deleted file mode 100644 index 5bf36d7..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_13_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_13_RELEASE.xml deleted file mode 100644 index f411bbe..0000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_13_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/1067-yuexiu-task-model-mybatis/1067-yuexiu-task-model-mybatis.iml b/1067-yuexiu-task-model-mybatis/1067-yuexiu-task-model-mybatis.iml index cc0b3a6..e6c3253 100644 --- a/1067-yuexiu-task-model-mybatis/1067-yuexiu-task-model-mybatis.iml +++ b/1067-yuexiu-task-model-mybatis/1067-yuexiu-task-model-mybatis.iml @@ -9,7 +9,6 @@ - diff --git a/1068-yexiu-read-model-mybatis/1068-yexiu-read-model-mybatis.iml b/1068-yexiu-read-model-mybatis/1068-yexiu-read-model-mybatis.iml index 1c33b3e..84be0df 100644 --- a/1068-yexiu-read-model-mybatis/1068-yexiu-read-model-mybatis.iml +++ b/1068-yexiu-read-model-mybatis/1068-yexiu-read-model-mybatis.iml @@ -9,7 +9,6 @@ - @@ -54,7 +53,7 @@ - + @@ -75,6 +74,12 @@ + + + + + + @@ -152,18 +157,6 @@ - - - - - - - - - - - - @@ -210,5 +203,6 @@ + \ No newline at end of file diff --git a/1068-yexiu-read-model-mybatis/pom.xml b/1068-yexiu-read-model-mybatis/pom.xml index 920d688..55d2af7 100644 --- a/1068-yexiu-read-model-mybatis/pom.xml +++ b/1068-yexiu-read-model-mybatis/pom.xml @@ -23,10 +23,10 @@ 2069-siedemo-comm-api - - org.springframework.boot - spring-boot-starter-data-mongodb - + + + + diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewContentDao.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewContentDao.java new file mode 100644 index 0000000..e0ef660 --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewContentDao.java @@ -0,0 +1,11 @@ +package com.yuexiu.secp.read.model.dao; + +import com.sie.iot.common.model.dao.BaseCommonDAO_HI; +import com.yuexiu.secp.read.model.entities.ArticlePreviewContentEntity; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Component; + +@Component("ArticlePreviewContentDao") +public interface ArticlePreviewContentDao extends BaseCommonDAO_HI { + +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewDao.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewDao.java index 2e685a4..3277bfb 100644 --- a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewDao.java +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewDao.java @@ -1,12 +1,12 @@ package com.yuexiu.secp.read.model.dao; -import com.yuexiu.secp.read.model.entities.readonly.ArticlePreview; import com.sie.iot.common.model.dao.BaseCommonDAO_HI; +import com.yuexiu.secp.read.model.entities.ArticlePreviewEntity; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Component; @Component("ArticlePreviewDao") -public interface ArticlePreviewDao extends BaseCommonDAO_HI { +public interface ArticlePreviewDao extends BaseCommonDAO_HI { @Select("select * from sie_article_preview where promotion_status = 1 and task_status = 1") int findRecommend(); diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewProjectDao.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewProjectDao.java new file mode 100644 index 0000000..6bf077b --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewProjectDao.java @@ -0,0 +1,11 @@ +package com.yuexiu.secp.read.model.dao; + +import com.sie.iot.common.model.dao.BaseCommonDAO_HI; +import com.yuexiu.secp.read.model.entities.ArticlePreviewProjectEntity; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Component; + +@Component("ArticlePreviewProjectDao") +public interface ArticlePreviewProjectDao extends BaseCommonDAO_HI { + +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewSpreadDao.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewSpreadDao.java new file mode 100644 index 0000000..580ae8e --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/ArticlePreviewSpreadDao.java @@ -0,0 +1,11 @@ +package com.yuexiu.secp.read.model.dao; + +import com.sie.iot.common.model.dao.BaseCommonDAO_HI; +import com.yuexiu.secp.read.model.entities.ArticlePreviewSpreadEntity; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Component; + +@Component("ArticlePreviewSpreadDao") +public interface ArticlePreviewSpreadDao extends BaseCommonDAO_HI { + +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewContentEntity.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewContentEntity.java new file mode 100644 index 0000000..4353df5 --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewContentEntity.java @@ -0,0 +1,30 @@ +package com.yuexiu.secp.read.model.entities; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sie.iot.common.idgenerate.GeneratedKeyValue; +import com.sie.iot.common.model.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("yx_article_preview_content") +@GeneratedKeyValue +@ApiModel(value = "文章预览内容表") +public class ArticlePreviewContentEntity extends BaseEntity implements Serializable{ + @TableId(value = "preview_content_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键id") + private Long previewContentId; + @ApiModelProperty(value = "文章预览id") + private Long articlePreviewId; + @ApiModelProperty(value = "文章内容") + private String articleContent; + @ApiModelProperty(value = "租户id") + private Long tenantId; +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewEntity.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewEntity.java new file mode 100644 index 0000000..d64d475 --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewEntity.java @@ -0,0 +1,88 @@ +package com.yuexiu.secp.read.model.entities; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sie.iot.common.idgenerate.GeneratedKeyValue; +import com.sie.iot.common.model.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("yx_article_preview") +@GeneratedKeyValue +@ApiModel(value = "文章预览表") +public class ArticlePreviewEntity extends BaseEntity implements Serializable{ + @TableId(value = "cost_unit_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "文章预览id") + private Long articlePreviewId; + @ApiModelProperty(value = "文章任务id") + private Long articleId; + @ApiModelProperty(value = "发布单位") + private String publishUnit; + @ApiModelProperty(value = "文章标题") + private String articleTitle; + @ApiModelProperty(value = "推广开始时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date spreadBeginTime; + @ApiModelProperty(value = "推广结束时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date spreadEndTime; + @ApiModelProperty(value = "转发限制：1过期可推，2过期不可推") + private Integer shareType; + @ApiModelProperty(value = "建议文案1") + private String copyWrite1; + @ApiModelProperty(value = "建议文案2") + private String copyWrite2; + @ApiModelProperty(value = "建议文案3") + private String copyWrite3; + @ApiModelProperty(value = "建议文案4") + private String copyWrite4; + @ApiModelProperty(value = "建议文案5") + private String copyWrite5; + @ApiModelProperty(value = "分享摘要") + private String shareTitle; + @ApiModelProperty(value = "分享小图") + private String shareImg; + @ApiModelProperty(value = "计划发布时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date releaseTime; + @ApiModelProperty(value = "实际发布时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date releaseTaskTime; + @ApiModelProperty(value = "任务发布人") + private Integer releaseTaskUser; + @ApiModelProperty(value = "结束任务时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date endTaskTime; + @ApiModelProperty(value = "结束任务人") + private Integer endTaskUser; + @ApiModelProperty(value = "任务状态（1草稿/2待发布/3已发布/4已结束）") + private Integer taskStatus; + @ApiModelProperty(value = "推广状态（1有效期内/2已过有效期/3未开始）") + private Integer promotionStatus; + @ApiModelProperty(value = "审批状态") + private Integer approvalStatus; + @ApiModelProperty(value = "审批人") + private Integer approvalUser; + @ApiModelProperty(value = "审批时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date approvalTime; + @ApiModelProperty(value = "文章类别") + private Integer articleType; + @ApiModelProperty(value = "文章类别别名") + private String articleTypeAlias; + @ApiModelProperty(value = "作者名称") + private String authorName; + @ApiModelProperty(value = "原文连接") + private String articleUrl; + @ApiModelProperty(value = "底部二维码") + private String codeImg; + @ApiModelProperty(value = "租户id") + private Long tenantId; +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewProjectEntity.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewProjectEntity.java new file mode 100644 index 0000000..2a472b2 --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewProjectEntity.java @@ -0,0 +1,38 @@ +package com.yuexiu.secp.read.model.entities; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sie.iot.common.idgenerate.GeneratedKeyValue; +import com.sie.iot.common.model.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("yxh_article_preview_project") +@GeneratedKeyValue +@ApiModel(value = "文章预览表") +public class ArticlePreviewProjectEntity extends BaseEntity implements Serializable{ + @TableId(value = "preview_project_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键id") + private Long previewProjectId; + @ApiModelProperty(value = "文章预览id") + private Long articlePreviewId; + @ApiModelProperty(value = "关联类型: 1项目，2城市 ") + private Integer projectType; + @ApiModelProperty(value = "项目id") + private Long projectId; + @ApiModelProperty(value = "项目编码") + private String projectCode; + @ApiModelProperty(value = "项目描述") + private String projectDesc; + @ApiModelProperty(value = "项目区域") + private String projectArea; + @ApiModelProperty(value = "租户id") + private Long tenantId; +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewSpreadEntity.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewSpreadEntity.java new file mode 100644 index 0000000..c4eb603 --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/ArticlePreviewSpreadEntity.java @@ -0,0 +1,34 @@ +package com.yuexiu.secp.read.model.entities; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sie.iot.common.idgenerate.GeneratedKeyValue; +import com.sie.iot.common.model.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("yxh_article_preview_project") +@GeneratedKeyValue +@ApiModel(value = "文章预览表") +public class ArticlePreviewSpreadEntity extends BaseEntity implements Serializable{ + @TableId(value = "preview_spread_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键id") + private Long previewSpreadId; + @ApiModelProperty(value = "文章预览id") + private Long articlePreviewId; + @ApiModelProperty(value = "推广类型：1CDP标签，2部门，3项目") + private Integer spreadType; + @ApiModelProperty(value = "推广id") + private Long spreadId; + @ApiModelProperty(value = "推广编码") + private String spreadCode; + @ApiModelProperty(value = "推广描述") + private String spreadDesc; + @ApiModelProperty(value = "租户id") + private Long tenantId; +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/CostUnitEntity.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/CostUnitEntity.java index 5da7a00..f6bdd1c 100644 --- a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/CostUnitEntity.java +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/CostUnitEntity.java @@ -12,7 +12,7 @@ import lombok.Data; import java.io.Serializable; @Data -@TableName("sie_cost_unit") +@TableName("yxh_cost_unit") @GeneratedKeyValue @ApiModel(value = "成本单位") public class CostUnitEntity extends BaseEntity implements Serializable{ diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/ArticlePreview.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/ArticlePreview.java deleted file mode 100644 index f2c5774..0000000 --- a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/ArticlePreview.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.yuexiu.secp.read.model.entities.readonly; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.sie.iot.common.idgenerate.GeneratedKeyValue; -import lombok.Data; - -import java.sql.Time; - -@Data -@TableName("sie_article_preview") -@GeneratedKeyValue -public class ArticlePreview { - - @TableId(value = "article_preview_id", type = IdType.ASSIGN_ID) - private Long articlePreviewId; - private String articleTitle; - private String releaseUnitId; - private Time spreadBeginTime; - private Time spreadEndTime; - private Time plannedReleaseDate; - private Time actualReleaseDate; - private String extensionItem; - private int promotionStatus; - private int taskStatus; - private int approvalStatus; - private int extStatus; - private int forwardingLimit; - private int authorId; - private String pictureUrl; - private String shareAbstract; - private String articleUrl; - private String copywrite1; - private String copywrite2; - private String copywrite3; - private String copywrite4; - private String copywrite5; - private int createdBy; - private Time creationDate; - private int lastUpdatedBy; - private Time lastUpdateDate; - private int lastUpdateLogin; - private int deleteFlag; - private int versionNum; - -} diff --git a/1069-yuexiu-registration-model-mybatis/1069-yuexiu-registration-model-mybatis.iml b/1069-yuexiu-registration-model-mybatis/1069-yuexiu-registration-model-mybatis.iml index 58f98ba..408fdf0 100644 --- a/1069-yuexiu-registration-model-mybatis/1069-yuexiu-registration-model-mybatis.iml +++ b/1069-yuexiu-registration-model-mybatis/1069-yuexiu-registration-model-mybatis.iml @@ -9,7 +9,6 @@ - diff --git a/2067-yuexiu-task-application/2067-yuexiu-task-application.iml b/2067-yuexiu-task-application/2067-yuexiu-task-application.iml index d9e1523..68e80d4 100644 --- a/2067-yuexiu-task-application/2067-yuexiu-task-application.iml +++ b/2067-yuexiu-task-application/2067-yuexiu-task-application.iml @@ -18,7 +18,6 @@ - diff --git a/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/ArticlePreviewDto.java b/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/ArticlePreviewDto.java index 1e662a9..d8282bb 100644 --- a/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/ArticlePreviewDto.java +++ b/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/ArticlePreviewDto.java @@ -1,21 +1,64 @@ package com.yuexiu.secp.read.dto; -//查询最新推荐和我已推荐的Dto + +import com.alibaba.fastjson.annotation.JSONField; +import com.sie.iot.common.bean.ReqeustCommonDataBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.NoArgsConstructor; +import java.util.Date; +import java.util.List; @Data -@NoArgsConstructor -public class ArticlePreviewDto { - - //推广状态 - private int promotionStatus; - //任务状态 - private int taskStatus; - //项目id - private int projectId; - //城市id - private int cityId; +@ApiModel(value = "新增文章任务") +public class ArticlePreviewDto extends ReqeustCommonDataBean { + @ApiModelProperty(value = "发布单位") + private String publishUnit; + @ApiModelProperty(value = "文章类别") + private Integer articleType; + @ApiModelProperty(value = "文章类别别名") + private String articleTypeAlias; + @ApiModelProperty(value = "计划发布时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date releaseTime; + @ApiModelProperty(value = "推广开始时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date spreadBeginTime; + @ApiModelProperty(value = "推广结束时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date spreadEndTime; + @ApiModelProperty(value = "发布状态（1草稿/2待发布") + private Integer publishStatus; + @ApiModelProperty(value = "建议推广人,1.按CDP标签选择;2.按部门;3.按项目;4.按CDP标签删除") + private String spreadType; + @ApiModelProperty(value = "建议推广人选部门或项目时，需要返回选择项") + private List spreadList; + @ApiModelProperty(value = "转发限制：1过期可推，2过期不可推") + private Integer shareType; + @ApiModelProperty(value = "所属城市/项目（1按项目/2按城市）") + private Integer placeOfOrigin; + @ApiModelProperty(value = "文章标题") + private String articleTitle; + @ApiModelProperty(value = "文章正文") + private String articleContent; + @ApiModelProperty(value = "建议文案1") + private String copyWrite1; + @ApiModelProperty(value = "建议文案2") + private String copyWrite2; + @ApiModelProperty(value = "建议文案3") + private String copyWrite3; + @ApiModelProperty(value = "建议文案4") + private String copyWrite4; + @ApiModelProperty(value = "建议文案5") + private String copyWrite5; + @ApiModelProperty(value = "分享小图") + private String shareImg; + @ApiModelProperty(value = "分享摘要") + private String shareTitle; + @ApiModelProperty(value = "原文链接") + private String articleUrl; + @ApiModelProperty(value = "底部二维码") + private String codeImg; } diff --git a/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/RecommendDto.java b/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/RecommendDto.java new file mode 100644 index 0000000..58f5fcc --- /dev/null +++ b/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/RecommendDto.java @@ -0,0 +1,21 @@ +package com.yuexiu.secp.read.dto; +//查询最新推荐和我已推荐的Dto + +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@NoArgsConstructor +public class RecommendDto { + + //推广状态 + private int promotionStatus; + //任务状态 + private int taskStatus; + //项目id + private int projectId; + //城市id + private int cityId; + +} diff --git a/2068-yexiu-read-application/2068-yexiu-read-application.iml b/2068-yexiu-read-application/2068-yexiu-read-application.iml index 48761d4..ad15599 100644 --- a/2068-yexiu-read-application/2068-yexiu-read-application.iml +++ b/2068-yexiu-read-application/2068-yexiu-read-application.iml @@ -18,7 +18,6 @@ - @@ -224,7 +223,7 @@ - + @@ -283,11 +282,6 @@ - - - - - diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/ArticlePreviewController.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/ArticlePreviewController.java index abe86c5..8665ebb 100644 --- a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/ArticlePreviewController.java +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/ArticlePreviewController.java @@ -1,29 +1,49 @@ package com.yuexiu.secp.read.controller; +import com.alibaba.fastjson.JSONObject; +import com.sie.iot.common.bean.RequestData; +import com.sie.iot.common.bean.ResponseData; +import com.sie.iot.common.model.inter.IBaseCommon; +import com.sie.iot.common.secure.annotation.CheckToken; +import com.sie.iot.common.services.CommonAbstractService; import com.yuexiu.secp.read.dto.ArticlePreviewDto; -import com.yuexiu.secp.read.model.service.IArticlePreviewService; +import com.yuexiu.secp.read.dto.CostUnitDto; +import com.yuexiu.secp.read.dto.RecommendDto; +import com.yuexiu.secp.read.model.entities.ArticlePreviewEntity; +import com.yuexiu.secp.read.model.entities.CostUnitEntity; +import com.yuexiu.secp.read.model.service.IArticlePreview; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - - +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/read/article/preview") -public class ArticlePreviewController { +public class ArticlePreviewController extends CommonAbstractService { @Autowired - private IArticlePreviewService iReadService; + private IArticlePreview iReadService; + + @Override + public IBaseCommon getBaseCommonServer() { + return this.iReadService;; + } @GetMapping(value = "/findRecommendedAndPast") - public String findRecommendedAndPast(ArticlePreviewDto articlePreviewDto) { + public String findRecommendedAndPast(RecommendDto articlePreviewDto) { return iReadService.findRecommendedAndPast(articlePreviewDto); } + @ApiOperation(value = "保存成本单位", notes = "保存成本单位") + @PostMapping(value = "/save") + @CheckToken + public ResponseData save(@RequestBody RequestData requestData) { + ArticlePreviewDto articlePreviewDto = requestData.getParams(); + getUserSessionBean().getUserId(); + return ResponseData.data(iReadService.saveArticlePreview(articlePreviewDto)); + } } diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IArticlePreview.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IArticlePreview.java new file mode 100644 index 0000000..59f8a3d --- /dev/null +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IArticlePreview.java @@ -0,0 +1,17 @@ +package com.yuexiu.secp.read.model.service; + + +import com.sie.iot.common.model.inter.IBaseCommon; +import com.yuexiu.secp.read.dto.ArticlePreviewDto; +import com.yuexiu.secp.read.dto.RecommendDto; +import com.yuexiu.secp.read.model.entities.ArticlePreviewEntity; +import com.yuexiu.secp.read.model.entities.CostUnitEntity; + +public interface IArticlePreview extends IBaseCommon { + + + String findRecommendedAndPast(RecommendDto articlePreviewDto); + + + ArticlePreviewEntity saveArticlePreview(ArticlePreviewDto dto); +} diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IArticlePreviewService.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IArticlePreviewService.java deleted file mode 100644 index 96235c2..0000000 --- a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IArticlePreviewService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yuexiu.secp.read.model.service; - - -import com.yuexiu.secp.read.dto.ArticlePreviewDto; - -public interface IArticlePreviewService { - - - String findRecommendedAndPast(ArticlePreviewDto articlePreviewDto); - -} diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/ArticlePreviewService.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/ArticlePreviewServer.java similarity index 64% rename from 2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/ArticlePreviewService.java rename to 2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/ArticlePreviewServer.java index f88088f..800fa05 100644 --- a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/ArticlePreviewService.java +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/ArticlePreviewServer.java @@ -1,21 +1,32 @@ package com.yuexiu.secp.read.model.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Iterables; +import com.sie.iot.common.model.inter.server.BaseCommonServer; +import com.sie.iot.common.util.UserSessionHelper; +import com.yuexiu.secp.read.dto.RecommendDto; import com.yuexiu.secp.read.model.dao.ArticlePreviewDao; -import com.yuexiu.secp.read.model.entities.readonly.ArticlePreview; import com.yuexiu.secp.read.dto.ArticlePreviewDto; -import com.yuexiu.secp.read.model.service.IArticlePreviewService; +import com.yuexiu.secp.read.model.entities.ArticlePreviewEntity; +import com.yuexiu.secp.read.model.entities.CostUnitEntity; +import com.yuexiu.secp.read.model.service.IArticlePreview; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import com.sie.iot.common.services.CommonAbstractService; import java.util.*; +/** + * @author YuChengLong + * @date 2022/5/10 + */ + @Service -public class ArticlePreviewService implements IArticlePreviewService { +public class ArticlePreviewServer extends BaseCommonServer implements IArticlePreview { @Autowired @@ -26,14 +37,14 @@ public class ArticlePreviewService implements IArticlePreviewService { @Override - public String findRecommendedAndPast(ArticlePreviewDto articlePreviewDto) { + public String findRecommendedAndPast(RecommendDto articlePreviewDto) { //项目的集合信息 - List projectList = new ArrayList<>(); + List projectList = new ArrayList<>(); //城市的集合信息 - List articlePreviewList = new ArrayList<>(); + List articlePreviewList = new ArrayList<>(); - List dataList = new ArrayList<>(); + List dataList = new ArrayList<>(); //查询是否有最新推荐 int count = articlePreviewDao.findRecommend(); @@ -58,7 +69,7 @@ public class ArticlePreviewService implements IArticlePreviewService { if (true) { for (Object value : values) { //匹配项目，任务状态为已发布 ， 推广状态为有效 - ArticlePreview articlePreview = objectMapper.convertValue(value,ArticlePreview.class); + ArticlePreviewEntity articlePreview = objectMapper.convertValue(value,ArticlePreviewEntity.class); if(articlePreview.getPromotionStatus() == articlePreviewDto.getPromotionStatus() && articlePreview.getTaskStatus() == articlePreviewDto.getTaskStatus()){ //往城市里的集合塞数据 @@ -71,7 +82,7 @@ public class ArticlePreviewService implements IArticlePreviewService { for (Object value : values) { //匹配城市，任务状态为已发布 ， 推广状态为有效 - ArticlePreview articlePreview = objectMapper.convertValue(value,ArticlePreview.class); + ArticlePreviewEntity articlePreview = objectMapper.convertValue(value,ArticlePreviewEntity.class); if(articlePreview.getPromotionStatus() == articlePreviewDto.getPromotionStatus() && articlePreview.getTaskStatus() == articlePreviewDto.getTaskStatus()){ //往城市里的集合塞数据 @@ -89,4 +100,17 @@ public class ArticlePreviewService implements IArticlePreviewService { return "不为空"; } + + @Override + public ArticlePreviewEntity saveArticlePreview(ArticlePreviewDto dto) { + + ArticlePreviewEntity entity = new ArticlePreviewEntity(); + BeanUtil.copyProperties(dto,entity); + + //固定 +// entity.setOperatorUserId(UserSessionHelper.getCurrentSession().getUserId()); +// entity.setTenantId(UserSessionHelper.getCurrentSession().getTenantId()); + return entity; + } + } diff --git a/2068-yexiu-read-application/src/main/resources/application-yuexiu2068.yml b/2068-yexiu-read-application/src/main/resources/application-yuexiu2068.yml index 56d1acc..991b465 100644 --- a/2068-yexiu-read-application/src/main/resources/application-yuexiu2068.yml +++ b/2068-yexiu-read-application/src/main/resources/application-yuexiu2068.yml @@ -20,11 +20,11 @@ spring: min-idle: 8 max-wait: 3000ms timeout: 10000ms - data: - mongodb: - host: 127.0.0.1 - database: articledb - port: 27017 +# data: +# mongodb: +# host: 127.0.0.1 +# database: articledb +# port: 27017 # redis: # host: 192.168.88.200 # port: 5001 diff --git a/2068-yexiu-read-application/src/main/resources/application.properties b/2068-yexiu-read-application/src/main/resources/application.properties index d169f9c..7758c85 100644 --- a/2068-yexiu-read-application/src/main/resources/application.properties +++ b/2068-yexiu-read-application/src/main/resources/application.properties @@ -52,9 +52,10 @@ spring.cloud.nacos.discovery.server-addr=127.0.0.1:9010 properties.jdbc.driverClassName=com.mysql.jdbc.Driver -properties.jdbc.url=jdbc:mysql://127.0.0.1:3306/yxdc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true -properties.jdbc.username=root -properties.jdbc.password=root +properties.jdbc.url=jdbc:mysql://yuexiudev.rwlb.rds.aliyuncs\ + .com:3306/yxh?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true +properties.jdbc.username=app +properties.jdbc.password=!Dbrty@111 properties.jdbc.validationQuery=SELECT 1 properties.jdbc.initialSize=20 properties.jdbc.maxActive=800 diff --git a/2069-yuexiu-registration-application/2069-yuexiu-registration-application.iml b/2069-yuexiu-registration-application/2069-yuexiu-registration-application.iml index 50a02da..52fa5dc 100644 --- a/2069-yuexiu-registration-application/2069-yuexiu-registration-application.iml +++ b/2069-yuexiu-registration-application/2069-yuexiu-registration-application.iml @@ -18,7 +18,6 @@ -