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

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

@@ -4,21 +4,21 @@
		<Sql name='getArticleList'>
			<![CDATA[
		select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber
		from Org_Article m JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
		from Org_Article m JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 and  m.ArticleState =1  @Condition
		
			]]>
		</Sql>
		<!--<Sql name='getArticleList'>
		<Sql name='getArticleListCount'>
			<![CDATA[
		select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.PushNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber
		from Org_Article m JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
	select count(*) from Org_Article m 
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 and  m.ArticleState =1  @Condition
			]]>
		</Sql>-->
		<Sql name='getArticleListCount'>
		</Sql>
		<Sql name='getArticleById'>
			<![CDATA[
	select count(*) from Org_Article m 
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
		select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber
		from Org_Article m JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1   @Condition
			]]>
		</Sql>
@@ -32,14 +32,14 @@ User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
		<Sql name='getCollectionArticleList'>
			<![CDATA[
select aa.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber from (
select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and  1=1 @UserParam) as aa LEFT JOIN
select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and  1=1 and  m.ArticleState =1  @UserParam) as aa LEFT JOIN
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
			]]>
		</Sql>
		<Sql name='getCollectionArticleListCount'>
			<![CDATA[
select count(*) from (
select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and 1=1 @UserParam) as aa LEFT JOIN 
select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and 1=1 and  m.ArticleState =1  @UserParam) as aa LEFT JOIN
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
			]]>
		</Sql>
@@ -119,10 +119,10 @@ FROM dual   where not exists( select ArticleId from User_ArticleStatistics where
				select * from (
		select m.*,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthentication=1 and 1=1 @Condition
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthentication=1 and 1=1 and  m.ArticleState =1  @Condition
		union
		select m.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthentication=2 and  1=1 @Condition @Operatorid  
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthentication=2 and  1=1 and  m.ArticleState =1  @Condition @Operatorid
	) as aa  @PageParam
		
			]]>
@@ -130,9 +130,9 @@ LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthen
		<Sql name='getDoctorArticleListCount'>
			<![CDATA[
		select articleid from (
		select articleid from Org_Article where isauthentication=1  and 1=1  @Condition
		select articleid from Org_Article where isauthentication=1  and 1=1 and  m.ArticleState =1   @Condition
		union
		select articleid from Org_Article where  isauthentication=2 and  1=1 @Condition @Operatorid  
		select articleid from Org_Article where  isauthentication=2 and  1=1 and  m.ArticleState =1  @Condition @Operatorid
		) as aa 
			]]>
@@ -142,14 +142,14 @@ LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthen
			<![CDATA[
		select m.*,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   1=1 @Condition
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   1=1 and  m.ArticleState =1  @Condition
			]]>
		</Sql>
		<Sql name='getDoctorArticalByUserIdCount'>
			<![CDATA[
		select m.*,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   1=1 @Condition 		 
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   1=1 and  m.ArticleState =1  @Condition
		
			]]>
		</Sql>

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/WebRoot/WEB-INF/classes/articlePc.sql.xml

@@ -1,18 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<das-client>
	<Sqls> 
		 <!--<Sql name='getArticlePcList'>
		 <![CDATA[
				select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber ,IFNULL(n.PushNumber,0) as PushNumber ,
				(select count(1) from user_articlecollection a where a.ArticleId=m.ArticleId  @Condition2 )as collectionType, IFNULL(n.PushNumber,0) as PushNumber from Org_Article m
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1   and  ArticleState =1  @Condition    order by ArticleOrder desc  ,UpdateTime desc   @PageParam
			]]>
		</Sql>-->
		<Sql name='getArticlePcList'>
			<![CDATA[
				select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber ,IFNULL(n.PushNumber,0) as PushNumber ,
				(select count(1) from user_articlecollection a where a.ArticleId=m.ArticleId  @Condition2 )as collectionType, IFNULL(n.PushNumber,0) as PushNumber from Org_Article m
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1   and  ArticleState =1  @Condition    order by ArticleOrder desc  ,UpdateTime desc   @PageParam
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1   and  m.ArticleState =1  @Condition    order by ArticleOrder desc  ,UpdateTime desc   @PageParam
			]]>
		</Sql>
		<Sql name='getArticlePcListCount'>

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
}