Merge remote-tracking branch 'origin/dev_voice' into dev_voice

epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java

@@ -117,14 +117,17 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 			if (baseTokenDto != null) {
 				String redisKey = baseTokenDto.getApp() + "-" + baseTokenDto.getClient() + "-" + baseTokenDto.getUserId();
 				logger.info("redisKey=" + redisKey);
-				ServerHttpRequest build = exchange.getRequest().mutate()
+				exchange.getRequest().mutate()
 						.header(Constant.APP_USER_KEY, redisKey)
 						.header(AppClientConstant.APP,baseTokenDto.getApp())
 						.header(AppClientConstant.CLIENT,baseTokenDto.getClient())
 						.header(AppClientConstant.USER_ID,baseTokenDto.getUserId())
-						.header(AppClientConstant.CUSTOMER_ID,customerId)
 						.header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()})
-						.build();
+						;
+				if(StringUtils.equals(baseTokenDto.getApp(),"gov")){
+					exchange.getRequest().mutate().header(AppClientConstant.CUSTOMER_ID,customerId);
+				}
+				ServerHttpRequest build = exchange.getRequest().mutate().build();
 				return chain.filter(exchange.mutate().request(build).build());
 			}
 

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -655,6 +655,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	 * @date 2020.06.03 18:28
 	 **/
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public ArticleDetailResultDTO getArticleDetail(ResiArticleDetailFormDTO articleDetailFormDTO) {
 		//1.查询文章详情信息
 		ArticleDetailResultDTO articleInfo = baseDao.selectArticleDetail(articleDetailFormDTO.getGridId(),articleDetailFormDTO.getArticleId());

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleVisitRecordServiceImpl.java

@@ -72,6 +72,7 @@ public class ArticleVisitRecordServiceImpl extends BaseServiceImpl<ArticleVisitR
         String gridId = (String)params.get(ModuleConstant.FIELD_GRID_ID_CAMEL);
         String userId = (String)params.get(ModuleConstant.FIELD_USER_ID_CAMEL);
         String articleId = (String)params.get(ModuleConstant.FIELD_ARTICLE_ID_CAMEL);
+        String customerId = (String)params.get(ModuleConstant.FIELD_CUSTOMER_ID_CAMEL);
         String delFlag = (String)params.get(FieldConstant.DEL_FLAG_HUMP);
         QueryWrapper<ArticleVisitRecordEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -79,6 +80,7 @@ public class ArticleVisitRecordServiceImpl extends BaseServiceImpl<ArticleVisitR
         wrapper.eq(StringUtils.isNotBlank(userId),ModuleConstant.FIELD_USER_ID,userId);
         wrapper.eq(StringUtils.isNotBlank(articleId), ModuleConstant.FIELD_ARTICLE_ID,articleId);
         wrapper.eq(StringUtils.isNotBlank(delFlag),FieldConstant.DEL_FLAG,delFlag);
+        wrapper.eq(StringUtils.isNotBlank(customerId),ModuleConstant.FIELD_CUSTOMER_ID,customerId);
         return wrapper;
     }
 

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

@@ -105,7 +105,7 @@
         SELECT
         art.ID AS articleId,
         art.TITLE,
-        artcover.IMG_URL AS coverImg
+        IFNULL(artcover.IMG_URL,'') AS coverImg
         FROM
         ARTICLE art
         LEFT JOIN (
@@ -136,7 +136,7 @@
         art.STATUS_FLAG = 'published'
         AND
         art.IS_TOP = 1
-        ORDER BY art.PUBLISH_DATE , art.CREATED_TIME DESC
+        ORDER BY art.PUBLISH_DATE DESC , art.CREATED_TIME DESC
         LIMIT #{num}
     </select>
 
@@ -145,7 +145,7 @@
         SELECT
         art.ID AS articleId,
         art.TITLE AS articleTitle ,
-        artcover.IMG_URL AS articleCoverImg,
+        IFNULL(artcover.IMG_URL,'') AS articleCoverImg,
         art.PUBLISHER_NAME AS publishName,
         art.PUBLISH_DATE AS publishDate
         FROM
@@ -177,7 +177,7 @@
         AND
         art.STATUS_FLAG = 'published'
 
-        ORDER BY art.PUBLISH_DATE , art.CREATED_TIME DESC
+        ORDER BY art.PUBLISH_DATE DESC , art.CREATED_TIME DESC
         LIMIT #{num}
     </select>
 
@@ -188,8 +188,8 @@
         art.TITLE AS articleTitle,
         art.PUBLISHER_NAME AS publishName,
         art.PUBLISH_DATE AS publishDate,
-        art.PREVIEW_CONTENT AS articleContent,
+        IFNULL(art.PREVIEW_CONTENT,'') AS articleContent,
-        art.TAGS AS tagName
+        IFNULL(art.TAGS,'') AS tagName
         FROM
         ARTICLE art
         INNER JOIN ARTICLE_PUBLISH_RANGE prange
@@ -204,15 +204,18 @@
         art.DEL_FLAG = '0'
         AND art.STATUS_FLAG = 'published'
             <if test="null != tagIdList and tagIdList.size > 0">
-                <foreach collection="tagIdList" item="tagId" open="AND EXISTS(" separator=" OR " close=")">
+                <foreach collection="tagIdList" item="tagId"  separator=" ">
+                    AND EXISTS(
                     SELECT 1
                     FROM ARTICLE_TAGS
                     WHERE DEL_FLAG = '0'
                     AND ARTICLE_ID = art.ID
                     AND TAG_ID=#{tagId}
+                    )
                 </foreach>
             </if>
         </where>
+        ORDER BY art.PUBLISH_DATE DESC , art.CREATED_TIME DESC
     </select>
 
     <!-- 文章详情ResultMap -->
@@ -222,6 +225,7 @@
         <result property="publishUnitDesc" column="publishUnitDesc"/>
         <result property="publishDate" column="publishDate"/>
         <result property="tags" column="tags"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
         <collection property="articleContentList" ofType="com.epmet.dto.result.ArticleContentResultDTO">
            <result property="content" column="CONTENT" />
             <result property="contentType" column="CONTENT_TYPE" />
@@ -235,7 +239,7 @@
         art.TITLE AS articleTitle,
         art.PUBLISHER_NAME AS publishUnitDesc,
         art.PUBLISH_DATE AS publishDate,
-        art.TAGS AS tags,
+        IFNULL(art.TAGS,'') AS tags,
         content2.CONTENT,
         content2.CONTENT_TYPE,
         (SELECT COUNT(1) FROM ARTICLE_VISIT_RECORD WHERE DEL_FLAG = '0' AND ARTICLE_ID = #{articleId} AND GRID_ID = #{gridId}) AS visitRecordCount,
@@ -252,8 +256,8 @@
         ARTICLE_CONTENT content
         WHERE
         DEL_FLAG = '0'
-        AND ARTICLE_ID = #{aritcleId}
+        AND ARTICLE_ID = #{articleId}
-        AND NOT EXISTS ( SELECT 1 FROM ARTICLE_CONTENT WHERE DEL_FLAG = '0' AND ORDER_NUM = content.ORDER_NUM AND ARTICLE_ID = #{aritcleId} AND content.CREATED_TIME <![CDATA[<]]>  CREATED_TIME )
+        AND NOT EXISTS ( SELECT 1 FROM ARTICLE_CONTENT WHERE DEL_FLAG = '0' AND ORDER_NUM = content.ORDER_NUM AND ARTICLE_ID = #{articleId} AND content.CREATED_TIME <![CDATA[<]]>  CREATED_TIME )
         GROUP BY
         ORDER_NUM
         ORDER BY
@@ -265,7 +269,7 @@
         WHERE
         art.DEL_FLAG = '0'
 
-        AND art.ID = #{aritcleId}
+        AND art.ID = #{articleId}
         ORDER BY content2.ORDER_NUM ASC
     </select>
 </mapper>