文章任务实体类初始化

.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mongodb:bson:3.6.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/bson/3.6.4/bson-3.6.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/bson/3.6.4/bson-3.6.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/bson/3.6.4/bson-3.6.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mongodb:mongodb-driver:3.6.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver/3.6.4/mongodb-driver-3.6.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver/3.6.4/mongodb-driver-3.6.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver/3.6.4/mongodb-driver-3.6.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mongodb:mongodb-driver-core:3.6.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/3.6.4/mongodb-driver-core-3.6.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/3.6.4/mongodb-driver-core-3.6.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/3.6.4/mongodb-driver-core-3.6.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_8_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:2.0.8.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.0.8.RELEASE/spring-boot-starter-data-mongodb-2.0.8.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.0.8.RELEASE/spring-boot-starter-data-mongodb-2.0.8.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.0.8.RELEASE/spring-boot-starter-data-mongodb-2.0.8.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_13_RELEASE.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.data:spring-data-mongodb:2.0.13.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.13.RELEASE/spring-data-mongodb-2.0.13.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.13.RELEASE/spring-data-mongodb-2.0.13.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.13.RELEASE/spring-data-mongodb-2.0.13.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

1067-yuexiu-task-model-mybatis/1067-yuexiu-task-model-mybatis.iml

@@ -9,7 +9,6 @@
           <factory-entry name="1067-yuexiu-task-model-mybatis" />
           <factory-entry name="Entities" />
         </datasource-mapping>
-        <naming-strategy-map />
       </configuration>
     </facet>
     <facet type="Spring" name="Spring">

1068-yexiu-read-model-mybatis/1068-yexiu-read-model-mybatis.iml

@@ -9,7 +9,6 @@
           <factory-entry name="1068-yexiu-read-model-mybatis" />
           <factory-entry name="Entities" />
         </datasource-mapping>
-        <naming-strategy-map />
       </configuration>
     </facet>
     <facet type="Spring" name="Spring">
@@ -54,7 +53,7 @@
     <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
     <orderEntry type="library" name="Maven: com.sie.irradiator:1008-sieiot-jwt-api:1.0.9" level="project" />
     <orderEntry type="library" name="Maven: com.sie.irradiator:1003-sieiot-core:1.0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.3.0" level="project" />
     <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
@@ -75,6 +74,12 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.13" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.37" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.14.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
@@ -152,18 +157,6 @@
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:9.7.0" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:9.7.0" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-java8:9.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:2.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver:3.6.4" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:bson:3.6.4" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.6.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:2.0.13.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.60" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
@@ -210,5 +203,6 @@
     <orderEntry type="library" name="Maven: com.google.inject:guice:4.1.0" level="project" />
     <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
   </component>
 </module>

1068-yexiu-read-model-mybatis/pom.xml

@@ -23,10 +23,10 @@
             <artifactId>2069-siedemo-comm-api</artifactId>
         </dependency>
 
-        <dependency>
+        <!--<dependency>-->
-            <groupId>org.springframework.boot</groupId>
+            <!--<groupId>org.springframework.boot</groupId>-->
-            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+            <!--<artifactId>spring-boot-starter-data-mongodb</artifactId>-->
-        </dependency>
+        <!--</dependency>-->
 
     </dependencies>
 

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<ArticlePreviewContentEntity> {
+
+}

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<ArticlePreview> {
+public interface ArticlePreviewDao extends BaseCommonDAO_HI<ArticlePreviewEntity> {
 
     @Select("select * from sie_article_preview where promotion_status = 1 and task_status = 1")
     int findRecommend();

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<ArticlePreviewProjectEntity> {
+
+}

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<ArticlePreviewSpreadEntity> {
+
+}

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<ArticlePreviewContentEntity> 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;
+}

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<ArticlePreviewEntity> 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;
+}

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<ArticlePreviewProjectEntity> 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;
+}

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<ArticlePreviewSpreadEntity> 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;
+}

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<CostUnitEntity> implements Serializable{

1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/ArticlePreview.java

@@ -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;
-
-}

1069-yuexiu-registration-model-mybatis/1069-yuexiu-registration-model-mybatis.iml

@@ -9,7 +9,6 @@
           <factory-entry name="1069-yuexiu-registration-model-mybatis" />
           <factory-entry name="Entities" />
         </datasource-mapping>
-        <naming-strategy-map />
       </configuration>
     </facet>
     <facet type="Spring" name="Spring">

2067-yuexiu-task-application/2067-yuexiu-task-application.iml

@@ -18,7 +18,6 @@
           <factory-entry name="2067-yuexiu-task-application" />
           <factory-entry name="Entities" />
         </datasource-mapping>
-        <naming-strategy-map />
       </configuration>
     </facet>
     <facet type="Spring" name="Spring">

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
+@ApiModel(value = "新增文章任务")
-public class ArticlePreviewDto {
+public class ArticlePreviewDto extends ReqeustCommonDataBean {
-
-    //推广状态
-    private int promotionStatus;
-    //任务状态
-    private int taskStatus;
-    //项目id
-    private int projectId;
-    //城市id
-    private int cityId;
 
+    @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<Object> 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;
 }

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;
+
+}

2068-yexiu-read-application/2068-yexiu-read-application.iml

@@ -18,7 +18,6 @@
           <factory-entry name="2068-yexiu-read-application" />
           <factory-entry name="Entities" />
         </datasource-mapping>
-        <naming-strategy-map />
       </configuration>
     </facet>
     <facet type="Spring" name="Spring">
@@ -224,7 +223,7 @@
     <orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final" level="project" />
     <orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:1.4.26.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:1.1.3.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish:javax.el:3.0.0" level="project" />
     <orderEntry type="module" module-name="1068-yexiu-read-model-mybatis" />
     <orderEntry type="library" name="Maven: com.sie.irradiator:1011-sieiot-common-model-mybatis:2.3.3.31.1" level="project" />
@@ -283,11 +282,6 @@
     <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.3.Final" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:2.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver:3.6.4" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:bson:3.6.4" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.6.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:2.0.13.RELEASE" level="project" />
     <orderEntry type="module" module-name="2068-yexiu-read-api" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.0.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.0.2.RELEASE" level="project" />

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.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
 
 @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<ArticlePreviewEntity> save(@RequestBody RequestData<ArticlePreviewDto> requestData) {
+        ArticlePreviewDto articlePreviewDto = requestData.getParams();
 
+        getUserSessionBean().getUserId();
 
+        return ResponseData.data(iReadService.saveArticlePreview(articlePreviewDto));
+    }
 
 }

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<CostUnitEntity> {
+
+
+    String findRecommendedAndPast(RecommendDto articlePreviewDto);
+
+
+    ArticlePreviewEntity saveArticlePreview(ArticlePreviewDto dto);
+}

2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IArticlePreviewService.java

@@ -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);
-
-}

2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/ArticlePreviewService.java → 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<CostUnitEntity> implements IArticlePreview {
 
 
     @Autowired
@@ -26,14 +37,14 @@ public class ArticlePreviewService implements IArticlePreviewService {
 
 
     @Override
-    public String findRecommendedAndPast(ArticlePreviewDto articlePreviewDto) {
+    public String findRecommendedAndPast(RecommendDto articlePreviewDto) {
         //项目的集合信息
-        List<ArticlePreview> projectList = new ArrayList<>();
+        List<ArticlePreviewEntity> projectList = new ArrayList<>();
 
         //城市的集合信息
-        List<ArticlePreview> articlePreviewList = new ArrayList<>();
+        List<ArticlePreviewEntity> articlePreviewList = new ArrayList<>();
 
-        List<ArticlePreview> dataList = new ArrayList<>();
+        List<ArticlePreviewEntity> 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;
+    }
+
 }

2068-yexiu-read-application/src/main/resources/application-yuexiu2068.yml

@@ -20,11 +20,11 @@ spring:
         min-idle: 8
         max-wait: 3000ms
     timeout: 10000ms
-  data:
+#  data:
-    mongodb:
+#    mongodb:
-      host: 127.0.0.1
+#      host: 127.0.0.1
-      database: articledb
+#      database: articledb
-      port: 27017
+#      port: 27017
   #  redis:
 #    host: 192.168.88.200
 #    port: 5001

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.url=jdbc:mysql://yuexiudev.rwlb.rds.aliyuncs\
-properties.jdbc.username=root
+  .com:3306/yxh?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true
-properties.jdbc.password=root
+properties.jdbc.username=app
+properties.jdbc.password=!Dbrty@111
 properties.jdbc.validationQuery=SELECT 1
 properties.jdbc.initialSize=20
 properties.jdbc.maxActive=800

2069-yuexiu-registration-application/2069-yuexiu-registration-application.iml

@@ -18,7 +18,6 @@
           <factory-entry name="2069-yuexiu-registration-application" />
           <factory-entry name="Entities" />
         </datasource-mapping>
-        <naming-strategy-map />
       </configuration>
     </facet>
     <facet type="Spring" name="Spring">