Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/IndustryNewsDTO.java

@@ -37,4 +37,6 @@ public class IndustryNewsDTO implements Serializable {
     private Date createTime;
     @ApiModelProperty(value = "最新修改时间")
     private Date updateTime;
+    @ApiModelProperty(value = "是否是热点新闻")
+    private Integer isHot;
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/IndustryNewsVO.java

@@ -44,4 +44,7 @@ public class IndustryNewsVO implements Serializable {
 
     @ApiModelProperty(value = "来源",example = "来源")
     private String origin;
+
+    @ApiModelProperty(value = "是否是热点新闻 1是 0不是")
+    private Integer isHot;
 }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 838bc9199adfa6b189b70c2d0c26495670522bda
+  newTag: d716ba06478c08d9f6c49cbc563152e57391fec3

release-service/src/main/java/com/mmc/csf/release/entity/information/IndustryNewsDO.java

@@ -2,6 +2,7 @@ package com.mmc.csf.release.entity.information;
 
 import com.mmc.csf.infomation.vo.IndustryNewsDTO;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -32,13 +33,13 @@ public class IndustryNewsDO implements Serializable {
     @ApiModelProperty(value = "来源")
     private String origin;
     private Integer isDeleted;
-
+    private Integer isHot;
     public IndustryNewsDTO buildIndustryNewsDTO(){
         return IndustryNewsDTO.builder().id(id).newsTitle(newsTitle).newsAuthor(newsAuthor).userAccountId(userAccountId).surfaceImg(surfaceImg).
-                newsContents(newsContents).createTime(createTime).updateTime(updateTime).origin(origin).build();
+                newsContents(newsContents).isHot(isHot).createTime(createTime).updateTime(updateTime).origin(origin).build();
     }
 
-    public IndustryNewsDO(Integer id, String newsTitle, String newsAuthor, Integer userAccountId, String surfaceImg, String newsContents, String origin) {
+    public IndustryNewsDO(Integer id, String newsTitle, String newsAuthor, Integer userAccountId, String surfaceImg, String newsContents, String origin, Integer isHot) {
         this.id = id;
         this.newsTitle = newsTitle;
         this.newsAuthor = newsAuthor;
@@ -46,5 +47,6 @@ public class IndustryNewsDO implements Serializable {
         this.surfaceImg = surfaceImg;
         this.newsContents = newsContents;
         this.origin = origin;
+        this.isHot = isHot;
     }
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/IndustryNewsServiceImpl.java

@@ -72,14 +72,14 @@ public class IndustryNewsServiceImpl implements IndustryNewsService {
         if(count>0){
             return ResultBody.error(ResultEnum.INDUSTRY_NEWS_TITLE_EXISTS);
         }
-        industryNewsDO = new IndustryNewsDO(param.getId(), param.getNewsTitle(), param.getNewsAuthor(), userAccountId, param.getSurfaceImg(), param.getNewsContents(), param.getOrigin());
+        industryNewsDO = new IndustryNewsDO(param.getId(), param.getNewsTitle(), param.getNewsAuthor(), userAccountId, param.getSurfaceImg(), param.getNewsContents(), param.getOrigin(),param.getIsHot());
         industryNewsDao.insert(industryNewsDO);
         return ResultBody.success();
     }
 
     @Override
     public ResultBody upDateIndustryNews(IndustryNewsVO param, Integer userAccountId) {
-        IndustryNewsDO industryNewsDO = new IndustryNewsDO(param.getId(), param.getNewsTitle(), param.getNewsAuthor(), userAccountId, param.getSurfaceImg(), param.getNewsContents(), param.getOrigin());
+        IndustryNewsDO industryNewsDO = new IndustryNewsDO(param.getId(), param.getNewsTitle(), param.getNewsAuthor(), userAccountId, param.getSurfaceImg(), param.getNewsContents(), param.getOrigin(),param.getIsHot());
         industryNewsDao.update(industryNewsDO);
         return ResultBody.success();
     }

release-service/src/main/resources/mapper/news/IndustryNewsDao.xml

@@ -46,7 +46,7 @@
         <if test="keyword != null ">
             and news_title like CONCAT("%",#{keyword},"%")
         </if>
-        order by create_time desc
+        order by is_hot desc,create_time desc
         limit #{pageNo}, #{pageSize}
     </select>
 
@@ -59,7 +59,8 @@
                news_contents,
                origin,
                create_time,
-               update_time
+               update_time,
+               is_hot
         from industry_news
         where is_deleted = 0
           and id = #{id}
@@ -93,8 +94,8 @@
     <insert id="insert" parameterType="com.mmc.csf.release.entity.information.IndustryNewsDO" useGeneratedKeys="true"
             keyColumn="id">
         insert into industry_news(news_title, news_author, user_account_id, surface_img, news_contents, origin,
-                                  create_time)
-        values (#{newsTitle}, #{newsAuthor}, #{userAccountId}, #{surfaceImg}, #{newsContents}, #{origin}, now())
+                                  create_time,is_hot)
+        values (#{newsTitle}, #{newsAuthor}, #{userAccountId}, #{surfaceImg}, #{newsContents}, #{origin}, now(),#{isHot})
     </insert>
 
     <update id="update" parameterType="com.mmc.csf.release.entity.information.IndustryNewsDO">
@@ -121,6 +122,9 @@
             <if test="isDeleted !=null">
                 is_deleted = #{isDeleted},
             </if>
+            <if test="isHot != null">
+                is_hot = #{isHot}
+            </if>
         </set>
         where is_deleted = 0 and id = #{id}
     </update>
@@ -152,7 +156,8 @@
         news_contents,
         origin,
         create_time,
-        update_time
+        update_time,
+        is_hot
         from industry_news
         <where>
             is_deleted = 0
@@ -166,7 +171,7 @@
                 and create_time &lt;= #{endTime}
             </if>
         </where>
-        order by create_time desc
+        order by is_hot desc,create_time desc
         limit #{pageNo}, #{pageSize}
     </select>
 </mapper>
\ No newline at end of file