集美宣教代码提交

common/common-entity/src/main/java/com/yihu/es/entity/HealthEduArticleES.java

@@ -58,6 +58,7 @@ public class HealthEduArticleES {
    private String currentUserRoleLevel;//发送者当前登录的角色级别
    private Integer sendSource; //1或者为空 i健康后台推送  2PC端推送
    private Integer allCount;//所有的推送数目
    private Long readNumber;//阅读数（备注和浏览数不一样）
    @Transient
    private Boolean newArricleFlag;//新版文章推送标志
@@ -367,4 +368,12 @@ public class HealthEduArticleES {
    public void setUserType(Integer userType) {
        this.userType = userType;
    }
    public Long getReadNumber() {
        return readNumber;
    }
    public void setReadNumber(Long readNumber) {
        this.readNumber = readNumber;
    }
}

edu-article/JkEdu/src/com/yihu/jk/api/BehaviorApi.java

@@ -31,7 +31,7 @@ public class BehaviorApi {
		String articleId = StringUtil.isEmpty(json.get("articleId")) ? null : json.getString("articleId");
		String cName = StringUtil.isEmpty(json.get("cName")) ? null : json.getString("cName");
		String userId = StringUtil.isEmpty(json.get("userId")) ? null : json.getString("userId");
		int number = StringUtil.isEmpty(json.get("number")) ? 1 : json.getInt("userId");
		int number = StringUtil.isEmpty(json.get("number")) ? 1 : json.getInt("number");
		// 1、点赞 2、转发3、分享 4、浏览
		Integer behaviorAction = StringUtil.isEmpty(json.get("behaviorAction")) ? null : json.getInt("behaviorAction");
		if (StringUtil.isEmpty(articleId) || StringUtil.isEmpty(behaviorAction) || StringUtil.isEmpty(userId)) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -140,8 +140,11 @@ public class JMJkEduArticleService extends BaseService {
        Doctor doctor = null;
    
        List<HealthEduArticlePatientModel> resultList = new ArrayList<>();
        
        StringBuffer sql3 = null;
        for (HealthEduArticleES one : esList) {
            article = thirdJkEduArticleService.getArticalById(one.getArticleId(),"");
//            if (result.get(one.getArticleId()) != null) {
//                heapm = result.get(one.getArticleId());
@@ -163,6 +166,15 @@ public class JMJkEduArticleService extends BaseService {
            heapm.setLevel2TypeName(one.getSecondLevelCategoryName());
            heapm.setLevel(article.getString("articlelevel"));
//            heapm.setAllCount(heapm.getAllCount() + one.getPatients().size());
            sql3 = new StringBuffer();
            sql3.append("SELECT COUNT(*) as num FROM health_edu_article_patient_test3 WHERE isRead='1' AND patientCode is not null AND articleId='"+article.getString("articleId")+"'");
            Long num = elasticsearchUtil.excuteForLong(sql3.toString(), esType, esIndex);
            if(num!=null){
                heapm.setReadNumber(num.longValue());
            }else{
                heapm.setReadNumber(0L);
            }
            if(!StringUtils.isEmpty(article.getString("browseNumber"))){
                heapm.setBrowseNumbere(Integer.valueOf(article.getString("browseNumber")));//文章浏览数
            }else{

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/ElasticsearchUtil.java

@@ -184,7 +184,7 @@ public class ElasticsearchUtil {
            }
            SearchResponse response = (SearchResponse) requestBuilder.get();
            ObjectResult temp = new ObjectResultsExtractor(true, true, true).extractResults(response.getAggregations(), true);
            Long Longvalue = ((Double) temp.getLines().get(0).get(1)).longValue();
            Long Longvalue = ((Double) temp.getLines().get(0).get(0)).longValue();
            return Longvalue;
        } catch (Exception e) {
            logger.error(e.getMessage());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/vo/HealthEduArticlePatientModel.java

@@ -41,6 +41,8 @@ public class HealthEduArticlePatientModel {
    private Integer commentNumber=0;//文章评论数
    @ApiModelProperty(value = "文章点赞数", required = false, access = "response")
    private Integer pointNumber=0;//文章点赞数
    @ApiModelProperty(value = "文章阅读数", required = false, access = "response")
    private Long readNumber=0L;//文章阅读数
    @ApiModelProperty(value = "封面图", required = false, access = "response")
    private String articleCover="";//封面图
    @ApiModelProperty(value = "发送类型", required = false, access = "response")
@@ -257,4 +259,12 @@ public class HealthEduArticlePatientModel {
    public void setArticleSource(String articleSource) {
        this.articleSource = articleSource;
    }
    public Long getReadNumber() {
        return readNumber;
    }
    public void setReadNumber(Long readNumber) {
        this.readNumber = readNumber;
    }
}