Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

edu-article/JkEdu/WebRoot/WEB-INF/classes/Behavior.sql.xml

@@ -66,6 +66,12 @@ FROM dual   where not exists( select ArticleId from User_ArticleCollection where
		
			]]>
			</Sql>
		<Sql name='getArticleCollection'>
			<![CDATA[
		select * from User_ArticleCollection where 1=1  @Condition
			]]>
		</Sql>
		
	</Sqls>
</das-client>

edu-article/JkEdu/src/Behavior.sql.xml

@@ -66,6 +66,12 @@ FROM dual   where not exists( select ArticleId from User_ArticleCollection where
		
			]]>
			</Sql>
		<Sql name='getArticleCollection'>
			<![CDATA[
		select * from User_ArticleCollection where 1=1  @Condition
			]]>
		</Sql>
		
	</Sqls>
</das-client>

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

@@ -34,7 +34,7 @@ public class ArticleApiTest {
		// System.out.println(api.getCollectionArticalList(im));
		// System.out.println(api.getArticalById(im));
		queryArticlePcList();
		saveBehavior();
//		System.out.printf("350200".substring(0,3));
	}
@@ -120,16 +120,16 @@ public class ArticleApiTest {
		BehaviorApi api = new BehaviorApi();
		InterfaceMessage im = new InterfaceMessage();
		JSONObject obj = new JSONObject();
		obj.put("articleId","0A2BABB7A6734DD7B47496461CF04B21");
		obj.put("articleId","012EA731315E4E6F8F7227D09B730BEA");
		obj.put("cName","标题");//
		obj.put("userId","11");
		obj.put("number",2);//
		obj.put("behaviorAction",7);
		obj.put("userId","xh1D2017031502222");
		obj.put("userType","1");
		obj.put("articleCategoryId",2);//
		im.setParam(obj.toString());
		initDB();
		try{
//			api.authenticationArticle(im);
			System.out.println(api.saveBehavior(im));
			System.out.println(api.saveArticleCollection(im));
		}catch(Exception e){
			e.printStackTrace();
		}

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

@@ -86,25 +86,30 @@ public class BehaviorApi {
		vo.setUserType(userType);
		vo.setcName(cName);
		vo.setUserId(userId);
		ArticleStatistic arvo = new ArticleStatistic();
		arvo.setArticleId(articleId);
//		ArticleStatistic arvo = new ArticleStatistic();
//		arvo.setArticleId(articleId);
		try {
			subDao.saveArticleCollection(vo);
//			if (userType == 2) {
			int size = subDao.getArticleCollection(vo);
			if(size==0){
				subDao.saveArticleCollection(vo);
				int behaviorAction = 6;
				int number = 1;
				ArticleApi.updateArticleStatistic(articleId, behaviorAction, number);
				Behavior behavior = new Behavior();
				behavior.setArticleId(articleId);
				behavior.setBehaviorAction(behaviorAction);
				behavior.setcName(cName);
				behavior.setUserId(userId);
//				arvo.setArticleId(articleId);
				subDao.saveBehavior(behavior);
			}
//			if (userType == 2) {
//			}
			Behavior behavior = new Behavior();
			behavior.setArticleId(articleId);
			behavior.setBehaviorAction(behaviorAction);
			behavior.setcName(cName);
			behavior.setUserId(userId);
//			ArticleStatistic arvo = new ArticleStatistic();
			arvo.setArticleId(articleId);
			subDao.saveBehavior(behavior);
			return ApiUtil.getRespJSON(10000, "成功").toString();
		} catch (SQLException e) {
@@ -140,16 +145,21 @@ public class BehaviorApi {
		arvo.setArticleId(articleId);
		try {
			int count = subDao.deleteArticleCollection(vo);
//			if (userType == 2) {
				int behaviorAction = 6;
				int number = -1;
				ArticleApi.updateArticleStatistic(articleId, behaviorAction, number);
//			}
			if (count == 0) {
				return ApiUtil.getRespJSON(-10001, "收藏失败").toString();
			int size = subDao.getArticleCollection(vo);
			if(size>0){
				int count = subDao.deleteArticleCollection(vo);
//				if (userType == 2) {
//				}
				if (count > 0) {
					int behaviorAction = 6;
					int number = -1;
					ArticleApi.updateArticleStatistic(articleId, behaviorAction, number);
				}else{
					return ApiUtil.getRespJSON(-10001, "收藏失败").toString();
				}
			}
			return ApiUtil.getRespJSON(10000, "成功").toString();
		} catch (SQLException e) {
			e.printStackTrace();

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

@@ -103,6 +103,17 @@ public class BehaviorDao {
		return list.size();
	}
	public int getArticleCollection(ArticleCollection vo) throws SQLException {
		Sql sql = DB.me().createSql(BehaviorSqlNameEnum.getArticleCollection);
		StringBuffer param = new StringBuffer();
		param.append(" and UserId  ='").append(vo.getUserId()).append("'");
		param.append(" and ArticleId  ='").append(vo.getArticleId()).append("'");
		param.append(" and UserType  =").append(vo.getUserType());
		sql.addVar("@Condition", param.toString());
		List<ArticleCollection> list = DB.me().queryForBeanList(MyDatabaseEnum.JkEduDB, sql, ArticleCollection.class);
		return list.size();
	}
	public void deleteBehavior(Behavior vo) throws SQLException {
		Sql sql = DB.me().createSql(BehaviorSqlNameEnum.deleteBehavior);
		StringBuffer param = new StringBuffer();

edu-article/JkEdu/src/com/yihu/jk/enums/BehaviorSqlNameEnum.java

@@ -4,6 +4,6 @@ import com.coreframework.db.SqlNameEnum;
public enum BehaviorSqlNameEnum implements SqlNameEnum {
	saveBehavior, saveArticleCollection, deleteArticleCollection, saveArticleComment, getArticleCommentList, deleteBehavior
	saveBehavior, saveArticleCollection, deleteArticleCollection, saveArticleComment, getArticleCommentList, deleteBehavior,getArticleCollection
}