Merge branch 'dev' of liuwenbin/patient-co-management into dev

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

@@ -557,15 +557,15 @@ public class ArticleApi {
			orgArticleVo.setArticleSource(orgName);
			//新增文章时 保存分享数，阅读数等数据
			ArticleStatistic statistic = new ArticleStatistic();
			statistic.setBrowseNumber(0);
			statistic.setPointNumber(0);
			statistic.setCommentNumber(0);
			statistic.setShareNumber(0);
			statistic.setCollectionNumber(0);
			statistic.setArticleId(articleId);
			dao.insertArticleInitStatistic(statistic);
//			ArticleStatistic statistic = new ArticleStatistic();
//			statistic.setBrowseNumber(0);
//			statistic.setPointNumber(0);
//			statistic.setCommentNumber(0);
//			statistic.setShareNumber(0);
//			statistic.setCollectionNumber(0);
//			statistic.setArticleId(articleId);
//			dao.insertArticleInitStatistic(statistic);
			dao.insertArticleStatistic(articleId);
			return dao.saveArticle(orgArticleVo).toString();
		}else{
			orgArticleVo.setArticleId(articleId);

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

@@ -83,7 +83,8 @@ public class ArticleApiTest {
		initDB();
		try{
//			api.authenticationArticle(im);
			System.out.println(api.queryArticleAPPList(im));
//			System.out.println(api.authenArticlePCList(im));//initArticleStatistic
			api.initArticleStatistic();
		}catch(Exception e){
			e.printStackTrace();
		}

edu-article/JkEdu/src/com/yihu/jk/dao/ArticleDao.java

@@ -297,8 +297,8 @@ public class ArticleDao {
	public void insertArticleStatistic(String articleId) throws SQLException {
		Sql sql = DB.me().createSql(ArticleSqlNameEnum.insertArticleStatistic);
		sql.addParamValue(articleId);
		sql.addParamValue(articleId);
		System.out.println(sql.toString());
//		sql.addParamValue(articleId);
//		System.out.println(sql.toString());
		DB.me().insert(MyDatabaseEnum.JkEduDB, sql);
	}
@@ -778,6 +778,7 @@ public class ArticleDao {
        Sql sql = DB.me().createSql(ArticleSqlNameEnum.getArticlePcList);
        StringBuffer param = new StringBuffer();
		StringBuffer param2 = new StringBuffer();
        StringBuffer pageParam = new StringBuffer();
        if (StringUtil.isNotEmpty(vo.getFirstLevelCategoryId())) {
            param.append(" and FirstLevelCategoryId = ? ");
@@ -811,6 +812,7 @@ public class ArticleDao {
        }
        sql.addVar("@Condition", param.toString());
        sql.addVar("@PageParam", pageParam.toString());
		sql.addVar("@Condition2", param2.toString());
        return DB.me().queryForJson(MyDatabaseEnum.JkEduDB, sql, start, pageSize);
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jkEduArticle/ThirdJkEduArticleService.java

@@ -104,6 +104,7 @@ public class ThirdJkEduArticleService extends BaseService {
    private String updateArticleQRCode = "JkEdu.ArticleQR.updateArticleQRCode";//更新认证标识
    private String saveArticleQRCode = "JkEdu.ArticleQR.saveArticleQRCode";//添加认证标识
    private String getArticleQRCodeById = "JkEdu.ArticleQR.getArticleQRCodeById";//根据id获取认证标识
    private String saveBehavior = "JkEdu.Behavior.saveBehavior";//根据id获取认证标识
    /**
     * 封装入参
     *
@@ -920,6 +921,27 @@ public class ThirdJkEduArticleService extends BaseService {
        }
    }
    /**************************************************** behaver *******************************************************/
    public void saveBehavior(String articleId,String cName,String userId) throws Exception {
        JSONObject json = null;
        try{
            JSONObject param = new JSONObject();
            param.put("articleId",articleId);// 文章ID
            param.put("cName",cName);//用户名称
            param.put("userId",userId);//用户ID
            String response = httpClientUtil.httpPost(articleBaseUrl+"/WsPlatform/rest", getParamsMap(saveBehavior, param.toString(), "1"));
            json = JSON.parseObject(response);
        }catch (Exception e) {
            e.printStackTrace();
        }
        if (!"10000".equals(json.getString("Code"))) {
            throw new Exception(json.getString("Message"));
        }
    }
    /**************************************************** other *******************************************************/
    /**

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/jimeiJkEdu/PatientJMJkEduArticleController.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.patient.jimeiJkEdu;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.wlyy.service.jimeiJkEdu.JMJkEduArticleService;
import com.yihu.wlyy.service.third.jkEduArticle.ThirdJkEduArticleService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,6 +29,8 @@ public class PatientJMJkEduArticleController extends BaseController {
    @Autowired
    private JMJkEduArticleService jmJkEduArticleService;
    @Autowired
    private ThirdJkEduArticleService thirdJkEduArticleService;
    @RequestMapping(value = "fetchArticlePushedList", method = RequestMethod.GET)
    @ApiOperation("居民获取被推送文章列表 ")
@@ -183,4 +186,20 @@ public class PatientJMJkEduArticleController extends BaseController {
            return error(-1,"查询失败！");
        }
    }
    @RequestMapping(value = "saveBehavior", method = RequestMethod.POST)
    @ApiOperation("添加 浏览、转发、分享、点赞 ")
    public String saveBehavior(
            @ApiParam(name = "articleId", value = "文章ID", required = true) @RequestParam(value = "articleId", required = true) String articleId,
            @ApiParam(name = "cName", value = "用户名称", required = true) @RequestParam(value = "cName", required = true) String cName,
            @ApiParam(name = "userId", value = "用户ID", required = true) @RequestParam(value = "userId", required = false) String  userId){
        try {
            thirdJkEduArticleService.saveBehavior(articleId,cName,userId);
//            Long count = healthEducationArticleService.pushArticleLogsCount("ece5c665b16542b0847e52b4a9fee44a");
            return write(200,"保存成功！");
        }catch (Exception e) {
            e.printStackTrace();
            return error(-1,"保存失败！");
        }
    }
}