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

common/common-entity/src/main/java/com/yihu/edu/entity/IdEntity.java

@@ -0,0 +1,40 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.edu.entity;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import java.io.Serializable;
/**
 * 统一定义id的entity基类.
 * 
 * 基类统一定义id的属性名称、数据类型、列名映射及生成策略.
 * Oracle需要每个Entity独立定义id的SEQUCENCE时，不继承于本类而改为实现一个Idable的接口。
 * 
 * @author calvin
 */
// JPA 基类的标识
@MappedSuperclass
public abstract class IdEntity implements Serializable {
	private static final long serialVersionUID = 3673803562328635206L;
	protected String id;  // 非业务主键
	@Id
	@GeneratedValue(generator = "uuid")
	@GenericGenerator(name = "uuid", strategy = "uuid")
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
}

common/common-entity/src/main/java/com/yihu/edu/entity/RoleWithAuthorityCheck.java

@@ -0,0 +1,55 @@
package com.yihu.edu.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * 健康指标
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_edu_role_authority")
public class RoleWithAuthorityCheck extends IdEntity implements Serializable {
	private String code;//业务code
	private long userRoleId; //用户角色Id
	private boolean checkAuthority;//审核权限
	private boolean addArticleAuthority;//添加文章的权限
	public long getUserRoleId() {
		return userRoleId;
	}
	public void setUserRoleId(long userRoleId) {
		this.userRoleId = userRoleId;
	}
	public boolean isCheckAuthority() {
		return checkAuthority;
	}
	public void setCheckAuthority(boolean checkAuthority) {
		this.checkAuthority = checkAuthority;
	}
	public boolean isAddArticleAuthority() {
		return addArticleAuthority;
	}
	public void setAddArticleAuthority(boolean addArticleAuthority) {
		this.addArticleAuthority = addArticleAuthority;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
}

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

@@ -1,66 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<das-client>
	<Sqls> 
		 <Sql name='getArticleList'>
		 <![CDATA[
	<Sqls>
		<Sql name='getArticleList'>
			<![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
		
			]]>
		</Sql>
			 <Sql name='getArticleListCount'>
		 <![CDATA[
		<Sql name='getArticleListCount'>
			<![CDATA[
	select count(*) from Org_Article m 
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
			]]>
		</Sql>
				 <Sql name='getCollectionArticleList'>
		 <![CDATA[
		<Sql name='getCollectionArticleList'>
			<![CDATA[
select aa.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber 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 
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
			]]>
		</Sql>
					 <Sql name='getCollectionArticleListCount'>
		 <![CDATA[
		<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 
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
			]]>
		</Sql>
			 <Sql name='pointNumberCount'>
		 <![CDATA[
		<Sql name='pointNumberCount'>
			<![CDATA[
select *  from User_Behavior where  BehaviorAction=1 and 1=1 @Condition
			]]>
		</Sql>
			 <Sql name='collectionNumberCount'>
		 <![CDATA[
		<Sql name='collectionNumberCount'>
			<![CDATA[
select * from User_ArticleCollection where 1=1 @Condition
			]]>
		</Sql>
		 <Sql name='updateArticleStatistic'>
		 <![CDATA[
		<Sql name='updateArticleStatistic'>
			<![CDATA[
		 update User_ArticleStatistics set @behaviorParam where @ArticleId
			]]>
		</Sql>
		
		 <Sql name='updateCollectionStatistic'>
		 <![CDATA[
		<Sql name='updateCollectionStatistic'>
			<![CDATA[
		 update User_ArticleStatistics set @behaviorParam= (
select count(*) from User_ArticleCollection where 1=1 @Condition) where @ArticleId
			]]>
		</Sql>
			 <Sql name='updateCommentStatistic'>
		 <![CDATA[
		<Sql name='updateCommentStatistic'>
			<![CDATA[
		 update User_ArticleStatistics  set @behaviorParam= (
select count(*) from User_ArticleComment where 1=1 @Condition) where @ArticleId
			]]>
		</Sql>
			 <Sql name='insertArticleStatistic'>
		 <![CDATA[
		<Sql name='insertArticleStatistic'>
			<![CDATA[
					
				INSERT INTO User_ArticleStatistics (		
			ArticleId
@@ -70,14 +70,14 @@ FROM dual   where not exists( select ArticleId from User_ArticleStatistics where
	
			]]>
		</Sql>
		 <Sql name='deleteArticleStatistic'>
		 <![CDATA[
		<Sql name='deleteArticleStatistic'>
			<![CDATA[
					
				delete  from User_ArticleStatistics
			]]>
		</Sql>
		 <Sql name='queryArticleStatistic'>
		 <![CDATA[
		<Sql name='queryArticleStatistic'>
			<![CDATA[
				select * from (
			select count(case behavioraction when '1' then 'PointNumber' end) as PointNumber,
			 count(case behavioraction when '3' then 'ShareNumber' end) as ShareNumber, 
@@ -89,19 +89,19 @@ FROM dual   where not exists( select ArticleId from User_ArticleStatistics where
			ON  aa.articleid=bb.articleid
			]]>
			
		</Sql>
		 <Sql name='insertArticleInitStatistic'>
		 <![CDATA[
		<Sql name='insertArticleInitStatistic'>
			<![CDATA[
			INSERT INTO User_ArticleStatistics (ArticleId, BrowseNumber, PointNumber, CommentNumber, ShareNumber, CollectionNumber) VALUES (?,?,?,?,?,?);
			]]>
			
		</Sql>
		
			 <Sql name='getDoctorArticleList'>
		 <![CDATA[
		<Sql name='getDoctorArticleList'>
			<![CDATA[
				select * from (
		select m.*,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
@@ -113,8 +113,8 @@ LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthen
		
			]]>
		</Sql>
			 <Sql name='getDoctorArticleListCount'>
		 <![CDATA[
		<Sql name='getDoctorArticleListCount'>
			<![CDATA[
		select articleid from (
		select articleid from Org_Article where isauthentication=1  and 1=1  @Condition
		union
@@ -123,16 +123,16 @@ LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthen
			]]>
		</Sql>
		
			 <Sql name='getDoctorArticalByUserId'>
		 <![CDATA[
		<Sql name='getDoctorArticalByUserId'>
			<![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
			]]>
		</Sql>
			 <Sql name='getDoctorArticalByUserIdCount'>
		 <![CDATA[
		<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 		 

edu-article/JkEdu/WebRoot/WEB-INF/classes/route/JkEdu.xml

@@ -5,7 +5,7 @@
<module name="JkEdu.Subscrive" remoteClass="com.yihu.jk.api.SubscriveApi"></module>
<module name="JkEdu.Category" remoteClass="com.yihu.jk.api.CategoryApi"></module>
<module name="JkEdu.ConfigSys" remoteClass="com.yihu.jk.api.ConfigSysApi"></module>
<module name="JkEdu.ConfigDicSho" remoteClass="com.yihu.jk.api.ConfigDicShoApi"></module>
</Mapping>
<Route url="url.JkEdu"></Route>
</Config>

edu-article/JkEdu/WebRoot/WEB-INF/classes/sys.xml

@@ -8,13 +8,17 @@
  <!-- 数据库连接配置  -->
  <DB.Alias>jkedudb</DB.Alias>
  <DB.DatabaseName>jkedudb</DB.DatabaseName>
  <DB.IP>172.19.103.85</DB.IP>
  <!--<DB.IP>172.19.103.85</DB.IP>-->
  <!--<DB.Port>3306</DB.Port>-->
  <!--<DB.UserName>linzhou</DB.UserName>-->
  <!--<DB.Password>FDw6DUFgoKg=</DB.Password>-->
  <DB.IP>172.19.103.77</DB.IP>
  <DB.Port>3306</DB.Port>
  <DB.UserName>linzhou</DB.UserName>
  <DB.Password>FDw6DUFgoKg=</DB.Password>
  <EhrApiUrl>http://ehr.yihu.com/wlyyfz</EhrApiUrl>
  <DB.UserName>root</DB.UserName>
  <DB.Password>VYhw4YNnygE=</DB.Password>
  <!--<EhrApiUrl>http://ehr.yihu.com/wlyyfz</EhrApiUrl>-->
  <EhrApiUrl>http://192.168.131.131:8080/</EhrApiUrl>
  <!--ehr的登入地址（重定向到本工程的登入页）-->
  <LoginUrl>http://ehr.yihu.com/wlyyfz/auth/login.html?redirect_url=http://localhost:8080/JkEdu/ssoLogin.html</LoginUrl>
  <LoginUrl>http://172.19.103.87:9088/wlyyfz/auth/login.html?redirect_url=http://192.168.131.131:8088/JkEdu/ssoLogin.html</LoginUrl>
</Config>

edu-article/JkEdu/WebRoot/ssoLogin.html

@@ -15,7 +15,8 @@
		"photo" : "../../../images/d-male.png",
		"id" :4798,
		"hospital":"3502110400",
		"userRole":[{"code":"350200","name":"厦门市卫生与计划生育委员会","areas":"350203"}]
		"userRole":[{"code":"350200","name":"厦门市卫生与计划生育委员会","areas":"350203"}],
		"currentUserRole":{"code":"350200","name":"厦门市卫生与计划生育委员会","areas":"350203","level":""}
		
	}));
	

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

@@ -1,66 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<das-client>
	<Sqls> 
		 <Sql name='getArticleList'>
		 <![CDATA[
	<Sqls>
		<Sql name='getArticleList'>
			<![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
		
			]]>
		</Sql>
			 <Sql name='getArticleListCount'>
		 <![CDATA[
		<Sql name='getArticleListCount'>
			<![CDATA[
	select count(*) from Org_Article m 
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
			]]>
		</Sql>
				 <Sql name='getCollectionArticleList'>
		 <![CDATA[
		<Sql name='getCollectionArticleList'>
			<![CDATA[
select aa.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber 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 
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
			]]>
		</Sql>
					 <Sql name='getCollectionArticleListCount'>
		 <![CDATA[
		<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 
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
			]]>
		</Sql>
			 <Sql name='pointNumberCount'>
		 <![CDATA[
		<Sql name='pointNumberCount'>
			<![CDATA[
select *  from User_Behavior where  BehaviorAction=1 and 1=1 @Condition
			]]>
		</Sql>
			 <Sql name='collectionNumberCount'>
		 <![CDATA[
		<Sql name='collectionNumberCount'>
			<![CDATA[
select * from User_ArticleCollection where 1=1 @Condition
			]]>
		</Sql>
		 <Sql name='updateArticleStatistic'>
		 <![CDATA[
		<Sql name='updateArticleStatistic'>
			<![CDATA[
		 update User_ArticleStatistics set @behaviorParam where @ArticleId
			]]>
		</Sql>
		
		 <Sql name='updateCollectionStatistic'>
		 <![CDATA[
		<Sql name='updateCollectionStatistic'>
			<![CDATA[
		 update User_ArticleStatistics set @behaviorParam= (
select count(*) from User_ArticleCollection where 1=1 @Condition) where @ArticleId
			]]>
		</Sql>
			 <Sql name='updateCommentStatistic'>
		 <![CDATA[
		<Sql name='updateCommentStatistic'>
			<![CDATA[
		 update User_ArticleStatistics  set @behaviorParam= (
select count(*) from User_ArticleComment where 1=1 @Condition) where @ArticleId
			]]>
		</Sql>
			 <Sql name='insertArticleStatistic'>
		 <![CDATA[
		<Sql name='insertArticleStatistic'>
			<![CDATA[
					
				INSERT INTO User_ArticleStatistics (		
			ArticleId
@@ -70,14 +70,14 @@ FROM dual   where not exists( select ArticleId from User_ArticleStatistics where
	
			]]>
		</Sql>
		 <Sql name='deleteArticleStatistic'>
		 <![CDATA[
		<Sql name='deleteArticleStatistic'>
			<![CDATA[
					
				delete  from User_ArticleStatistics
			]]>
		</Sql>
		 <Sql name='queryArticleStatistic'>
		 <![CDATA[
		<Sql name='queryArticleStatistic'>
			<![CDATA[
				select * from (
			select count(case behavioraction when '1' then 'PointNumber' end) as PointNumber,
			 count(case behavioraction when '3' then 'ShareNumber' end) as ShareNumber, 
@@ -89,19 +89,19 @@ FROM dual   where not exists( select ArticleId from User_ArticleStatistics where
			ON  aa.articleid=bb.articleid
			]]>
			
		</Sql>
		 <Sql name='insertArticleInitStatistic'>
		 <![CDATA[
		<Sql name='insertArticleInitStatistic'>
			<![CDATA[
			INSERT INTO User_ArticleStatistics (ArticleId, BrowseNumber, PointNumber, CommentNumber, ShareNumber, CollectionNumber) VALUES (?,?,?,?,?,?);
			]]>
			
		</Sql>
		
			 <Sql name='getDoctorArticleList'>
		 <![CDATA[
		<Sql name='getDoctorArticleList'>
			<![CDATA[
				select * from (
		select m.*,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
@@ -113,8 +113,8 @@ LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthen
		
			]]>
		</Sql>
			 <Sql name='getDoctorArticleListCount'>
		 <![CDATA[
		<Sql name='getDoctorArticleListCount'>
			<![CDATA[
		select articleid from (
		select articleid from Org_Article where isauthentication=1  and 1=1  @Condition
		union
@@ -123,16 +123,16 @@ LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthen
			]]>
		</Sql>
		
			 <Sql name='getDoctorArticalByUserId'>
		 <![CDATA[
		<Sql name='getDoctorArticalByUserId'>
			<![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
			]]>
		</Sql>
			 <Sql name='getDoctorArticalByUserIdCount'>
		 <![CDATA[
		<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 		 

edu-article/JkEdu/classes/artifacts/JkEdu_war_exploded/WEB-INF/classes/route/JkEdu.xml

@@ -5,7 +5,7 @@
<module name="JkEdu.Subscrive" remoteClass="com.yihu.jk.api.SubscriveApi"></module>
<module name="JkEdu.Category" remoteClass="com.yihu.jk.api.CategoryApi"></module>
<module name="JkEdu.ConfigSys" remoteClass="com.yihu.jk.api.ConfigSysApi"></module>
<module name="JkEdu.ConfigDicSho" remoteClass="com.yihu.jk.api.ConfigDicShoApi"></module>
</Mapping>
<Route url="url.JkEdu"></Route>
</Config>

edu-article/JkEdu/src/ArticleQR.xml

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<das-client>
	<Sqls> 
		<Sql name='getArticleORCode'>
		 	<![CDATA[
					select * from Config_ArticleQRCode
			]]>
		</Sql>
		<Sql name='getArticleQRDetail'>
			<![CDATA[
					select * from Config_ArticleQRCode where 1=1  @Condition
			]]>
		</Sql>
	</Sqls>
</das-client>

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

@@ -5,11 +5,6 @@
		 <![CDATA[
	select * from Config_Signatur
				]]>
			</Sql>
				 <Sql name='getArticleORCode'>
		 <![CDATA[
	select * from Config_ArticleQRCode
				]]>
			</Sql>
				 <Sql name='getConfigSys'>
		 <![CDATA[

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

@@ -3,7 +3,12 @@
	<Sqls> 
		 <Sql name='getArticlePcList'>
		 <![CDATA[
				select * from Org_Article where 1=1  and  ArticleState =1  @Condition    order by ArticleOrder desc  ,UpdateTime desc   
				select * from Org_Article where 1=1  and  ArticleState =1  @Condition    order by ArticleOrder desc  ,UpdateTime desc   @PageParam
			]]>
		</Sql>
		<Sql name='getArticlePcListCount'>
			<![CDATA[
				select count(1) from Org_Article where 1=1  and  ArticleState =1  @Condition
			]]>
		</Sql>
		

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

@@ -1,8 +1,12 @@
package com.yihu.jk.api;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.List;
import com.coreframework.remoting.standard.DateOper;
import com.yihu.jk.vo.Article;
import com.yihu.jk.vo.OrgArticleVo;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -472,4 +476,137 @@ public class ArticleApi {
		}
	}
	/************************************************* new ************************************************************/
	/**
	 * 添加文章
	 * @param im
	 * @return
	 * @throws JSONException
	 */
	public String saveArticle(InterfaceMessage im) throws JSONException {
		JSONObject json = JSONObject.fromObject(im.getParam());
		String userCode = StringUtil.isEmpty(json.get("userCode")) ? null : json.getString("userCode");
		if (StringUtil.isEmpty(userCode)) {
			return ApiUtil.getRespJSON(-10000, "userCode 必传").toString();
		}
		String	orgName = StringUtil.isEmpty(json.get("orgName")) ? null : json.getString("orgName");//组织名称
		String	deptName = StringUtil.isEmpty(json.get("deptName")) ? null : json.getString("deptName");//科室名称
		String	levelName = StringUtil.isEmpty(json.get("levelName")) ? null : json.getString("levelName");//职称
		String	photo = StringUtil.isEmpty(json.get("photo")) ? null : json.getString("photo");//头像
		String	orgId = StringUtil.isEmpty(json.get("orgId")) ? null : json.getString("orgId");//组织
		String	userName = StringUtil.isEmpty(json.get("userName")) ? null : json.getString("userName");//登录名称
		String	articleTitle = StringUtil.isEmpty(json.get("articleTitle")) ? null : json.getString("articleTitle");//标题
		String	articleType = StringUtil.isEmpty(json.get("articleType")) ? null : json.getString("articleType");//类型
		Integer	articlelevel = StringUtil.isEmpty(json.get("articlelevel")) ? null : json.getInt("articlelevel");//文章级别
		String	secondLevelCategoryId = StringUtil.isEmpty(json.get("secondLevelCategoryId")) ? null : json.getString("secondLevelCategoryId");//二级分类id
		String	secondLevelCategoryName = StringUtil.isEmpty(json.get("secondLevelCategoryName")) ? null : json.getString("secondLevelCategoryName");// 二级分类名称
		String	firstLevelCategoryId = StringUtil.isEmpty(json.get("firstLevelCategoryId")) ? null : json.getString("firstLevelCategoryId");//一级分类id
		String	firstLevelCategoryName = StringUtil.isEmpty(json.get("firstLevelCategoryName")) ? null : json.getString("firstLevelCategoryName");// 一级分类名称
		String	content = StringUtil.isEmpty(json.get("content")) ? null : json.getString("content");//内容
		String	newUrl = StringUtil.isEmpty(json.get("newUrl")) ? null : json.getString("newUrl");//封面图片地址
		String	operatorRoleCode = StringUtil.isEmpty(json.get("operatorRoleCode")) ? null : json.getString("operatorRoleCode");//操作人角色code
		String	opertorRoleLevel = StringUtil.isEmpty(json.get("opertorRoleLevel")) ? null : json.getString("opertorRoleLevel");//操作人角色级别
		Integer	userScope = StringUtil.isEmpty(json.get("userScope")) ? null : json.getInt("userScope");//使用范围（1、全市使用，2、全区使用，3、全社区使用）
		Integer	isAuthentication = StringUtil.isEmpty(json.get("isAuthentication")) ? null : json.getInt("isAuthentication");//是否认证
		String	authentication = StringUtil.isEmpty(json.get("authentication")) ? null : json.getString("authentication");//认证单位
		String	authenticationId = StringUtil.isEmpty(json.get("authenticationId")) ? null : json.getString("authenticationId");//认证单位ID
		Timestamp nowTime = DateOper.getNowDateTime();//插入和更新时间一样
		OrgArticleVo orgArticleVo = new OrgArticleVo();
		String articleId=StringUtil.createUUID();
		orgArticleVo.setArticleId(articleId);
		orgArticleVo.setArticleOrder(99);
		orgArticleVo.setArticleType(articleType);
		orgArticleVo.setArticleTitle(articleTitle);
		orgArticleVo.setArticleContent(content);
		orgArticleVo.setInsertTime(nowTime);
		orgArticleVo.setUpdateTime(nowTime);
		orgArticleVo.setArticleState(1);
		orgArticleVo.setArticlelevel(articlelevel);
		orgArticleVo.setSecondLevelCategoryId(secondLevelCategoryId);
		orgArticleVo.setFirstLevelCategoryId(firstLevelCategoryId);
		orgArticleVo.setFirstLevelCategoryName(firstLevelCategoryName);
		orgArticleVo.setArticleCover(newUrl);
		orgArticleVo.setDeptName(deptName);
		orgArticleVo.setTitleLevel(levelName);
		orgArticleVo.setOperatorImg(photo);
		orgArticleVo.setOrgId(orgId);
		orgArticleVo.setOperatorName(userName);
		orgArticleVo.setOperatorId(userCode);
		orgArticleVo.setLastOperatorId(userCode);
		orgArticleVo.setLastOperatorName(userName);
		orgArticleVo.setOperatorRoleCode(operatorRoleCode);
		orgArticleVo.setOperatorRoleLevel(opertorRoleLevel);
		orgArticleVo.setUserScope(userScope);
		orgArticleVo.setIsAuthentication(isAuthentication);
		orgArticleVo.setAuthentication(authentication);
		orgArticleVo.setAuthenticationId(authenticationId);
		if ("".equals(orgName)&&orgName==null){
			orgName = "无";
		}
		orgArticleVo.setOrgName(orgName);
		orgArticleVo.setArticleSource(orgName);
		orgArticleVo.setFirstLevelCategoryName(firstLevelCategoryName);
		orgArticleVo.setSecondLevelCategoryName(secondLevelCategoryName);
		return dao.saveArticle(orgArticleVo).toString();
	}
	/************************************************ PC *************************************************************/
	public String queryArticlePcList(InterfaceMessage im) throws Exception {
		JSONObject json = JSONObject.fromObject(im.getParam());
		String	firstLevelCategoryId = StringUtil.isEmpty(json.get("firstLevelCategoryId")) ? null : json.getString("firstLevelCategoryId");//一级分类id
		String	secondLevelCategoryId = StringUtil.isEmpty(json.get("secondLevelCategoryId")) ? null : json.getString("secondLevelCategoryId");//二级分类id
		String  insertTimeStart = StringUtil.isEmpty(json.get("insertTimeStart")) ? null : json.getString("insertTimeStart");//添加时间开始
		String  insertTimeEnd = StringUtil.isEmpty(json.get("insertTimeEnd")) ? null : json.getString("insertTimeEnd");//添加时间结束
		Integer	articlelevel = StringUtil.isEmpty(json.get("articlelevel")) ? null : json.getInt("articlelevel");//文章级别
		String  articleTitle = StringUtil.isEmpty(json.get("articleTitle")) ? null : json.getString("articleTitle");//文章标题
		String  userCode = StringUtil.isEmpty(json.get("userCode")) ? null : json.getString("userCode");//操作人id
		boolean  isManage = StringUtil.isEmpty(json.get("isManage")) ? false : json.getBoolean("isManage");//是否为管理员
		String  currentUserRole = StringUtil.isEmpty(json.get("currentUserRole")) ? null : json.getString("currentUserRole");//当前登录的角色
		String  currentUserRoleLevel = StringUtil.isEmpty(json.get("currentUserRoleLevel")) ? null : json.getString("currentUserRoleLevel");//当前登录的角色级别
		Integer	page = 0;
		Integer	pageSize = 0;
		if(!StringUtil.isEmpty(json.get("page"))){
			page = json.getInt("page");
		}else{
			return ApiUtil.getRespJSON(-10000, "page 必传").toString();
		}
		if(!StringUtil.isEmpty(json.get("pageSize"))){
			pageSize = json.getInt("pageSize");
		}else{
			return ApiUtil.getRespJSON(-10000, "pageSize 必传").toString();
		}
		OrgArticleVo vo = new OrgArticleVo();
		vo.setFirstLevelCategoryId(firstLevelCategoryId);
		vo.setSecondLevelCategoryId(secondLevelCategoryId);
		vo.setStartTime(insertTimeStart);
		vo.setEndTime(insertTimeEnd);
		vo.setArticlelevel(articlelevel);
		vo.setOperatorId(userCode);
		vo.setOperatorRoleCode(currentUserRole);
		vo.setArticleTitle(articleTitle);
		vo.setOperatorRoleLevel(currentUserRoleLevel);
		if(!isManage){
			vo.setIsAuthentication(1);
		}
		JSONArray array = new JSONArray();
		try {
			JSONObject rv = ApiUtil.getRespJSON(10000, "成功");
			List<Article> list = dao.queryArticlePcList(vo, page, pageSize);
			array.addAll(list);
			Integer count = dao.queryArticlePcListCount(vo);
			rv.put("Result", array);
			rv.put("Count", count);
		}catch (SQLException e) {
			e.printStackTrace();
			return ApiUtil.getRespJSON(-14444, "获取数据异常：" + e.getMessage()).toString();
		}
		return array.toString();
	}
}

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

@@ -1,5 +1,8 @@
package com.yihu.jk.api;
import com.coreframework.remoting.standard.DateOper;
import com.yihu.jk.utils.StringUtil;
import com.yihu.jk.vo.Category;
import net.sf.json.JSONObject;
import com.common.json.JSONException;
@@ -11,25 +14,26 @@ import com.yihu.wsgw.api.InterfaceMessage;
public class ArticleApiTest {
	public static void main(String[] args) throws JSONException {
		// TODO Auto-generated method stub
		ArticleApi api = new ArticleApi();
		InterfaceMessage im = new InterfaceMessage();
		JSONObject obj = new JSONObject();
		// obj.put("articleId",
		// "041A53270C7D4D0FBD6C0505A90B1AC0,10C85F5860874FF4BD75229FDFAF4B61");
		obj.put("firstLevelCategoryId", "33,37");
		// obj.put("userId", "0de7295862dd11e69faffa163e8aee56");
		obj.put("articleState", "1");
		// obj.put("articleTitle", "健康");
		im.setParam(obj.toString());
		initDB();
		// System.out.println(api.getDoctorArticalByUserId(im));
		System.out.println(api.getArticalList(im));
//		ArticleApi api = new ArticleApi();
//		InterfaceMessage im = new InterfaceMessage();
//		JSONObject obj = new JSONObject();
//		// obj.put("articleId",
//		// "041A53270C7D4D0FBD6C0505A90B1AC0,10C85F5860874FF4BD75229FDFAF4B61");
//		obj.put("firstLevelCategoryId", "33,37");
//		// obj.put("userId", "0de7295862dd11e69faffa163e8aee56");
//		obj.put("articleState", "1");
//
//		// obj.put("articleTitle", "健康");
//
//		im.setParam(obj.toString());
//		initDB();
//		// System.out.println(api.getDoctorArticalByUserId(im));
//		System.out.println(api.getArticalList(im));
		// System.out.println(api.getDoctorArticalList(im));
		// System.out.println(api.getCollectionArticalList(im));
		// System.out.println(api.getArticalById(im));
		queryArticlePcList();
	}
	public static void initDB() {
@@ -45,4 +49,31 @@ public class ArticleApiTest {
	}
	public static void queryArticlePcList(){
		ArticleApi api = new ArticleApi();
		InterfaceMessage im = new InterfaceMessage();
		JSONObject obj = new JSONObject();
		obj.put("page","1");
		obj.put("pageSize","2");
//		obj.put("firstLevelCategoryId","37");
//		obj.put("secondLevelCategoryId","32");
//		obj.put("insertTimeStart","1");
//		obj.put("insertTimeEnd","1");
//		obj.put("articlelevel","1");
//		obj.put("articleTitle","1");
//		obj.put("userCode","wjw00000001000e6badcfa163e424525");
//		obj.put("isManage",true);
//		obj.put("currentUserRole","350200");
//		obj.put("currentUserRoleLevel","1");
		im.setParam(obj.toString());
		initDB();
		try{
			System.out.println(api.queryArticlePcList(im));
		}catch(Exception e){
			e.printStackTrace();
		}
	}
}

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

@@ -0,0 +1,42 @@
package com.yihu.jk.api;
import com.yihu.jk.dao.ArticleQRCodeDao;
import com.yihu.jk.utils.ApiUtil;
import com.yihu.jk.utils.ConfigDictionaryUtil;
import com.yihu.jk.utils.StringUtil;
import com.yihu.jk.vo.ArticleQRCode;
import com.yihu.jk.vo.ConfigDictionaryShort;
import com.yihu.wsgw.api.InterfaceMessage;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import java.util.List;
public class ArticleQRCodeApi {
	private static ArticleQRCodeDao dao = new ArticleQRCodeDao();
	/**
	 * 获取认证标识信息（文章二维码信息）
	 * @param im
	 * @return
	 */
	public String getArticleQRCode(InterfaceMessage im) {
		try {
			JSONObject json = JSONObject.fromObject(im.getParam());
			String currentRoleLevel = StringUtil.isEmpty(json.get("currentRoleLevel")) ? null : json.getString("currentRoleLevel");
			String currentRoleCode = StringUtil.isEmpty(json.get("currentRoleCode")) ? null : json.getString("currentRoleCode");
			ArticleQRCode articleQRCode = new ArticleQRCode();
			articleQRCode.setOperatorRoleLevel(currentRoleLevel);
			articleQRCode.setOperatorRoleCode(currentRoleCode);
			ArticleQRCode vo = dao.getArticleQRDetail(articleQRCode);
			JSONObject object=JSONObject.fromObject(vo);
			JSONObject rv = ApiUtil.getRespJSON(10000, "成功");
			rv.put("Result", object.toString());
			return rv.toString();
		}catch (Exception e) {
			e.printStackTrace();
			return ApiUtil.getRespJSON(-14444, e.getMessage()).toString();
		}
	}
}

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

@@ -0,0 +1,51 @@
package com.yihu.jk.api;
import com.coreframework.db.DB;
import com.coreframework.util.AppConfig;
import com.yihu.jk.utils.SecretUtil;
import com.yihu.wsgw.api.InterfaceMessage;
import net.sf.json.JSONObject;
/**
 * 配置管理
 * 
 * @author GZX
 * 
 */
public class ArticleQRCodeApiTest {
	public static void main(String[] args){
		// getConfigSys();
		// getArticleORCode();
		getConfigDicShoList();
	}
	// 获取系统配置 认证 评论开关
	public static void getConfigDicShoList(){
		ConfigDicShoApi api = new ConfigDicShoApi();
		InterfaceMessage im = new InterfaceMessage();
		JSONObject obj = new JSONObject();
		obj.put("typeName","prio");
		im.setParam(obj.toString());
		initDB();
		System.out.println(api.getConfigDicShoList(im));
	}
	public static void initDB() {
		String DB_Alias = AppConfig.getValue("DB.Alias");
		String DB_DatabaseName = AppConfig.getValue("DB.DatabaseName");
		String DB_IP = AppConfig.getValue("DB.IP");
		String DB_UserName = AppConfig.getValue("DB.UserName");
		String DB_Password = SecretUtil.decrypt(AppConfig.getValue("DB.Password"));
		String DB_Port = AppConfig.getValue("DB.Port");
		DB.me().addDataSourceMySQL(DB_Alias, DB_DatabaseName, DB_IP, Integer.parseInt(DB_Port), DB_UserName,
				DB_Password);
	}
}

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

@@ -0,0 +1,60 @@
package com.yihu.jk.api;
import com.common.json.JSONException;
import com.coreframework.db.DB;
import com.coreframework.util.AppConfig;
import com.yihu.jk.utils.SecretUtil;
import com.yihu.wsgw.api.InterfaceMessage;
import net.sf.json.JSONObject;
/**
 * 配置管理
 * 
 * @author GZX
 * 
 */
public class CategoryApiTest {
	public static void main(String[] args){
		// getConfigSys();
		// getArticleORCode();
		addCategory();
	}
	// 获取系统配置 认证 评论开关
	public static void addCategory(){
		CategoryApi api = new CategoryApi();
		InterfaceMessage im = new InterfaceMessage();
		JSONObject obj = new JSONObject();
		obj.put("categoryId","1");
		obj.put("categoryName","1");
		obj.put("categoryLevel","1");
		obj.put("secondLevelId","1");
		obj.put("firstlevelId","1");
		obj.put("orgName","1");
		obj.put("orgId","1");
		obj.put("operatorName","1");
		obj.put("operatorId","1");
		im.setParam(obj.toString());
		initDB();
		System.out.println(api.addCategory(im));
	}
	public static void initDB() {
		String DB_Alias = AppConfig.getValue("DB.Alias");
		String DB_DatabaseName = AppConfig.getValue("DB.DatabaseName");
		String DB_IP = AppConfig.getValue("DB.IP");
		String DB_UserName = AppConfig.getValue("DB.UserName");
		String DB_Password = SecretUtil.decrypt(AppConfig.getValue("DB.Password"));
		String DB_Port = AppConfig.getValue("DB.Port");
		DB.me().addDataSourceMySQL(DB_Alias, DB_DatabaseName, DB_IP, Integer.parseInt(DB_Port), DB_UserName,
				DB_Password);
	}
}

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

@@ -0,0 +1,38 @@
package com.yihu.jk.api;
import com.coreframework.remoting.standard.DateOper;
import com.yihu.jk.dao.CategoryDao;
import com.yihu.jk.utils.ApiUtil;
import com.yihu.jk.utils.ConfigDictionaryUtil;
import com.yihu.jk.utils.StringUtil;
import com.yihu.jk.vo.Category;
import com.yihu.jk.vo.ConfigDictionaryShort;
import com.yihu.wsgw.api.InterfaceMessage;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import java.sql.SQLException;
import java.util.List;
public class ConfigDicShoApi {
	/**
	 * 获取字典数据
	 * @param im
	 * @return
	 */
	public String getConfigDicShoList(InterfaceMessage im) {
		try {
			JSONObject json = JSONObject.fromObject(im.getParam());
			String typeName = StringUtil.isEmpty(json.get("typeName")) ? null : json.getString("typeName");
			List<ConfigDictionaryShort> ls= ConfigDictionaryUtil.getDict(typeName);
			JSONArray array=JSONArray.fromObject(ls);
			JSONObject rv = ApiUtil.getRespJSON(10000, "成功");
			rv.put("Result", array.toString());
			return rv.toString();
		}catch (Exception e) {
			e.printStackTrace();
			return ApiUtil.getRespJSON(-14444, e.getMessage()).toString();
		}
	}
}

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

@@ -0,0 +1,51 @@
package com.yihu.jk.api;
import com.coreframework.db.DB;
import com.coreframework.util.AppConfig;
import com.yihu.jk.utils.SecretUtil;
import com.yihu.wsgw.api.InterfaceMessage;
import net.sf.json.JSONObject;
/**
 * 配置管理
 * 
 * @author GZX
 * 
 */
public class ConfigDicShoApiTest {
	public static void main(String[] args){
		// getConfigSys();
		// getArticleORCode();
		getConfigDicShoList();
	}
	// 获取系统配置 认证 评论开关
	public static void getConfigDicShoList(){
		ConfigDicShoApi api = new ConfigDicShoApi();
		InterfaceMessage im = new InterfaceMessage();
		JSONObject obj = new JSONObject();
		obj.put("typeName","prio");
		im.setParam(obj.toString());
		initDB();
		System.out.println(api.getConfigDicShoList(im));
	}
	public static void initDB() {
		String DB_Alias = AppConfig.getValue("DB.Alias");
		String DB_DatabaseName = AppConfig.getValue("DB.DatabaseName");
		String DB_IP = AppConfig.getValue("DB.IP");
		String DB_UserName = AppConfig.getValue("DB.UserName");
		String DB_Password = SecretUtil.decrypt(AppConfig.getValue("DB.Password"));
		String DB_Port = AppConfig.getValue("DB.Port");
		DB.me().addDataSourceMySQL(DB_Alias, DB_DatabaseName, DB_IP, Integer.parseInt(DB_Port), DB_UserName,
				DB_Password);
	}
}

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

@@ -3,13 +3,18 @@ package com.yihu.jk.dao;
import java.sql.SQLException;
import java.util.List;
import com.common.json.JSONObject;
import com.coreframework.db.DB;
import com.coreframework.db.Sql;
import com.coreframework.util.AppConfig;
import com.yihu.jk.enums.ArticleSqlNameEnum;
import com.yihu.jk.enums.MyDatabaseEnum;
import com.yihu.jk.enums.MyTableEnum;
import com.yihu.jk.utils.StringUtil;
import com.yihu.jk.utils.Utils;
import com.yihu.jk.vo.Article;
import com.yihu.jk.vo.ArticleStatistic;
import com.yihu.jk.vo.OrgArticleVo;
import org.springframework.stereotype.Component;
@Component
@@ -429,4 +434,122 @@ public class ArticleDao {
		return list.size();
	}
	/************************************************ new *************************************************************/
	/**
	 * 添加文章
	 * @param orgArticleVo
	 * @return
	 */
	public JSONObject saveArticle(OrgArticleVo orgArticleVo) {
		JSONObject json = new JSONObject();
		try {
			Sql sql = DB.me().createInsertSql(orgArticleVo, MyTableEnum.Org_Article);
			DB.me().insert(MyDatabaseEnum.JkEduDB, sql);
			json.put("Code", 10000);
			json.put("Message", "添加成功");
			return json;
		} catch (Exception e) {
			return new JSONObject(StringUtil.jsonResult(-1, Utils.getException(e)));
		}
	}
	/**
	 * PC端获取文章列表
	 * @param vo
	 * @param start
	 * @param pageSize
	 * @return
	 * @throws Exception
	 */
	public List<Article> queryArticlePcList(OrgArticleVo vo, int start, int pageSize) throws Exception {
		Sql sql = DB.me().createSql(ArticleSqlNameEnum.getArticlePcList);
		StringBuffer param = new StringBuffer();
		StringBuffer pageParam = new StringBuffer();
		if (StringUtil.isNotEmpty(vo.getFirstLevelCategoryId())) {
			param.append(" and FirstLevelCategoryId = ? ");
			sql.addParamValue(vo.getFirstLevelCategoryId());
		}
		if (StringUtil.isNotEmpty(vo.getSecondLevelCategoryId())) {
			param.append(" and SecondLevelCategoryId = ? ");
			sql.addParamValue(vo.getSecondLevelCategoryId());
		}
		if (StringUtil.isNotEmpty(vo.getStartTime())) {
			param.append(" and InsertTime >= ? ");
			sql.addParamValue(vo.getStartTime());
		}
		if (StringUtil.isNotEmpty(vo.getEndTime())) {
			param.append(" and InsertTime <= ? ");
			sql.addParamValue(vo.getEndTime());
		}
		if (StringUtil.isNotEmpty(vo.getArticlelevel())) {
			param.append(" and Articlelevel = ? ");
			sql.addParamValue(vo.getArticlelevel());
		}
		if (StringUtil.isNotEmpty(vo.getIsAuthentication())) {
			param.append(" and IsAuthentication = ? ");
			sql.addParamValue(vo.getIsAuthentication());
		}
		if (StringUtil.isNotEmpty(vo.getOperatorRoleLevel())) {
			param.append(" and OperatorRoleLevel >= ? ");
			sql.addParamValue(vo.getOperatorRoleLevel());
		}
		if (StringUtil.isNotEmpty(vo.getArticleTitle())) {
			param.append(" and ArticleTitle like '%"+vo.getArticleTitle()+"%' ");
		}
		pageParam.append(" limit ").append(start * pageSize + "," + pageSize);
		sql.addVar("@Condition", param.toString());
		sql.addVar("@PageParam", pageParam.toString());
		List<Article> list = DB.me().queryForBeanList(MyDatabaseEnum.JkEduDB, sql,Article.class);
		return list;
	}
	/**
	 * PC端获取文章列表总数
	 * @param vo
	 * @return
	 * @throws Exception
	 */
	public Integer queryArticlePcListCount(OrgArticleVo vo) throws Exception {
		Sql sql = DB.me().createSql(ArticleSqlNameEnum.getArticlePcListCount);
		StringBuffer param = new StringBuffer();
		StringBuffer pageParam = new StringBuffer();
		if (StringUtil.isNotEmpty(vo.getFirstLevelCategoryId())) {
			param.append(" and FirstLevelCategoryId = ? ");
			sql.addParamValue(vo.getFirstLevelCategoryId());
		}
		if (StringUtil.isNotEmpty(vo.getSecondLevelCategoryId())) {
			param.append(" and SecondLevelCategoryId = ? ");
			sql.addParamValue(vo.getSecondLevelCategoryId());
		}
		if (StringUtil.isNotEmpty(vo.getStartTime())) {
			param.append(" and InsertTime >= ? ");
			sql.addParamValue(vo.getStartTime());
		}
		if (StringUtil.isNotEmpty(vo.getEndTime())) {
			param.append(" and InsertTime <= ? ");
			sql.addParamValue(vo.getEndTime());
		}
		if (StringUtil.isNotEmpty(vo.getArticlelevel())) {
			param.append(" and Articlelevel = ? ");
			sql.addParamValue(vo.getArticlelevel());
		}
		if (StringUtil.isNotEmpty(vo.getIsAuthentication())) {
			param.append(" and IsAuthentication = ? ");
			sql.addParamValue(vo.getIsAuthentication());
		}
		if (StringUtil.isNotEmpty(vo.getOperatorRoleLevel())) {
			param.append(" and OperatorRoleLevel >= ? ");
			sql.addParamValue(vo.getOperatorRoleLevel());
		}
		if (StringUtil.isNotEmpty(vo.getArticleTitle())) {
			param.append(" and ArticleTitle like '%"+vo.getArticleTitle()+"%' ");
		}
		sql.addVar("@Condition", param.toString());
		Integer size = DB.me().queryForInteger(MyDatabaseEnum.JkEduDB, sql);
		return size;
	}
}

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

@@ -92,6 +92,7 @@ public class ArticlePcDao {
		}
		sql.addVar("@Condition", sb.toString());
		sql.addVar("@PageParam", "");
		return DB.me().queryForJson(MyDatabaseEnum.JkEduDB, sql, start, pageSize);
	}

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

@@ -5,8 +5,10 @@ import java.sql.Timestamp;
import com.common.json.JSONObject;
import com.coreframework.db.DB;
import com.coreframework.db.DatabaseEnum;
import com.coreframework.db.Sql;
import com.coreframework.remoting.standard.DateOper;
import com.yihu.jk.enums.ArticleSqlNameEnum;
import com.yihu.jk.enums.ConfigSysSqlNameEnum;
import com.yihu.jk.enums.MyDatabaseEnum;
import com.yihu.jk.enums.MyTableEnum;
@@ -76,4 +78,23 @@ public class ArticleQRCodeDao {
		return code;
	}
	/************************************************** new ***********************************************************/
	/**
	 *
	 * @param vo
	 * @return
	 * @throws SQLException
	 */
	public ArticleQRCode getArticleQRDetail(ArticleQRCode vo) throws SQLException {
		Sql sql = DB.me().createSql(ArticleSqlNameEnum.getArticleQRDetail);
		StringBuilder sb = new StringBuilder();
		sb.append(" and OperatorRoleCode = ? ");
		sql.addParamValue(vo.getOperatorRoleCode() );
		sb.append(" and OperatorRoleLevel = ? ");
		sql.addParamValue(vo.getOperatorRoleLevel() );
		ArticleQRCode articleQRCode = DB.me().queryForBean(MyDatabaseEnum.JkEduDB, sql,ArticleQRCode.class);
		return articleQRCode;
	}
}

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

@@ -6,6 +6,6 @@ public enum ArticleSqlNameEnum implements SqlNameEnum {
	getArticleList, getArticlePcList, queryCategory, getCollectionArticleList, loadAllConfigDictionary, getArticlePc, querySwitchState, pointNumberCount, collectionNumberCount, updateArticleStatistic, updateCollectionStatistic, updateCommentStatistic, insertArticleStatistic, deleteArticleStatistic, queryArticleStatistic, insertArticleInitStatistic
	, getArticlePcId, getDoctorArticleList, getDoctorArticleListCount, getDoctorArticalByUserIdCount, getDoctorArticalByUserId
	, getArticlePcId, getDoctorArticleList, getDoctorArticleListCount, getDoctorArticalByUserIdCount, getDoctorArticalByUserId,getArticlePcListCount
	, getArticleQRDetail
}

edu-article/JkEdu/src/com/yihu/jk/vo/Article.java

@@ -32,6 +32,9 @@ public class Article {
	private String DeptName;// 操作人所在科室
	private String TitleLevel;// 等级职称
	private String OperatorImg;// 操作人头像
	private String OperatorRoleCode;//操作人角色code
	private String OpertorRoleLevel;//操作人角色级别
	private Integer UserScope;//使用范围（1、全市使用，2、全区使用，3、全社区使用）
	public String getDeptName() {
		return DeptName;
@@ -233,4 +236,27 @@ public class Article {
		IsAuthentication = isAuthentication;
	}
	public String getOperatorRoleCode() {
		return OperatorRoleCode;
	}
	public void setOperatorRoleCode(String operatorRoleCode) {
		OperatorRoleCode = operatorRoleCode;
	}
	public String getOpertorRoleLevel() {
		return OpertorRoleLevel;
	}
	public void setOpertorRoleLevel(String opertorRoleLevel) {
		OpertorRoleLevel = opertorRoleLevel;
	}
	public Integer getUserScope() {
		return UserScope;
	}
	public void setUserScope(Integer userScope) {
		UserScope = userScope;
	}
}

edu-article/JkEdu/src/com/yihu/jk/vo/ArticleQRCode.java

@@ -12,6 +12,9 @@ public class ArticleQRCode {
	private String operatorId;// 创建人ID
	private String orgId;// 创建人所属机构ID
	private String orgName;// 创建人所属机构名称
	private String identification;//认证标识文字
	private String operatorRoleCode;//操作人角色code
	private String operatorRoleLevel;//操作人角色级别
	public int getId() {
		return id;
@@ -85,4 +88,27 @@ public class ArticleQRCode {
		this.orgName = orgName;
	}
	public String getIdentification() {
		return identification;
	}
	public void setIdentification(String identification) {
		this.identification = identification;
	}
	public String getOperatorRoleCode() {
		return operatorRoleCode;
	}
	public void setOperatorRoleCode(String operatorRoleCode) {
		this.operatorRoleCode = operatorRoleCode;
	}
	public String getOperatorRoleLevel() {
		return operatorRoleLevel;
	}
	public void setOperatorRoleLevel(String operatorRoleLevel) {
		this.operatorRoleLevel = operatorRoleLevel;
	}
}

edu-article/JkEdu/src/com/yihu/jk/vo/OrgArticleVo.java

@@ -9,7 +9,7 @@ import java.sql.Timestamp;
 */
public class OrgArticleVo {
	private String ArticleId;
	private String ArticleTitle;
	private String ArticleTitle;//文章标题
	private String ArticleContent;
	private Integer ArticleOrder;// 文章排序
	private Integer ArticleState;
@@ -18,14 +18,14 @@ public class OrgArticleVo {
	private String OrgId;// 操作人所属机构
	private Integer Articlelevel;// 文章级别
	private String ArticleCover;// 封面图
	private Timestamp InsertTime;
	private Timestamp UpdateTime;
	private Timestamp InsertTime;//添加时间
	private Timestamp UpdateTime;//更新时间
	private String OperatorName;// 操作人
	private String OperatorId;// 操作人id
	private String SecondLevelCategoryName;// 文章一级类别   名称
	private String SecondLevelCategoryId;// 文章二类别  ID
	private String StartTime;
	private String Authentication;// 认识单位
	private String Authentication;// 认证单位
	private String AuthenticationId;// 认证单位ID
	private String EndTime;
	private String ArticleType;// 文章类型
@@ -40,6 +40,10 @@ public class OrgArticleVo {
	private String LastOperatorId;// 最后修改人ID
	private String LastOperatorName;// 最后修改人
	private String OperatorRoleCode;//操作人角色code
	private String OperatorRoleLevel;//操作人角色级别
	private Integer UserScope;//使用范围（1、全市使用，2、全区使用，3、全社区使用）
	public String getFirstLevelCategoryName() {
		return FirstLevelCategoryName;
	}
@@ -274,7 +278,28 @@ public class OrgArticleVo {
	public void setLastOperatorName(String lastOperatorName) {
		LastOperatorName = lastOperatorName;
	}
	
	
	public String getOperatorRoleCode() {
		return OperatorRoleCode;
	}
	public void setOperatorRoleCode(String operatorRoleCode) {
		OperatorRoleCode = operatorRoleCode;
	}
	public String getOperatorRoleLevel() {
		return OperatorRoleLevel;
	}
	public void setOperatorRoleLevel(String operatorRoleLevel) {
		OperatorRoleLevel = operatorRoleLevel;
	}
	public Integer getUserScope() {
		return UserScope;
	}
	public void setUserScope(Integer userScope) {
		UserScope = userScope;
	}
}

edu-article/JkEdu/src/com/yihu/jk/vo/SessionBean.java

@@ -1,5 +1,8 @@
package com.yihu.jk.vo;
import java.util.List;
import java.util.Map;
public class SessionBean {
	private String userId;
	private String id;
@@ -13,9 +16,10 @@ public class SessionBean {
	private String levelName;//职称
	private String userRole;//用户的角色1.医生,2.机构管理员,3.卫计委
	private String token;//用户登入之后的token
	
	
	
	private List<Map<String,Object>> userRoleList;//用户角色列表
	private Map<String,Object> currentRole;//用户当前登入角色
	public String getImei() {
		return imei;
	}
@@ -88,6 +92,20 @@ public class SessionBean {
	public void setToken(String token) {
		this.token = token;
	}
	
	
	public List<Map<String, Object>> getUserRoleList() {
		return userRoleList;
	}
	public void setUserRoleList(List<Map<String, Object>> userRoleList) {
		this.userRoleList = userRoleList;
	}
	public Map<String, Object> getCurrentRole() {
		return currentRole;
	}
	public void setCurrentRole(Map<String, Object> currentRole) {
		this.currentRole = currentRole;
	}
}

edu-article/JkEdu/src/route/JkEdu.xml

@@ -5,7 +5,8 @@
<module name="JkEdu.Subscrive" remoteClass="com.yihu.jk.api.SubscriveApi"></module>
<module name="JkEdu.Category" remoteClass="com.yihu.jk.api.CategoryApi"></module>
<module name="JkEdu.ConfigSys" remoteClass="com.yihu.jk.api.ConfigSysApi"></module>
<module name="JkEdu.ConfigDicSho" remoteClass="com.yihu.jk.api.ConfigDicShoApi"></module>
<module name="JkEdu.ArticleQR" remoteClass="com.yihu.jk.api.getArticleQRCodeApi"></module>
</Mapping>
<Route url="url.JkEdu"></Route>
</Config>

edu-article/JkEdu/src/sys.xml

@@ -8,13 +8,17 @@
  <!-- 数据库连接配置  -->
  <DB.Alias>jkedudb</DB.Alias>
  <DB.DatabaseName>jkedudb</DB.DatabaseName>
  <DB.IP>172.19.103.85</DB.IP>
  <!--<DB.IP>172.19.103.85</DB.IP>-->
  <!--<DB.Port>3306</DB.Port>-->
  <!--<DB.UserName>linzhou</DB.UserName>-->
  <!--<DB.Password>FDw6DUFgoKg=</DB.Password>-->
  <DB.IP>172.19.103.77</DB.IP>
  <DB.Port>3306</DB.Port>
  <DB.UserName>linzhou</DB.UserName>
  <DB.Password>FDw6DUFgoKg=</DB.Password>
  <EhrApiUrl>http://ehr.yihu.com/wlyyfz</EhrApiUrl>
  <DB.UserName>root</DB.UserName>
  <DB.Password>VYhw4YNnygE=</DB.Password>
  <!--<EhrApiUrl>http://ehr.yihu.com/wlyyfz</EhrApiUrl>-->
  <EhrApiUrl>http://192.168.131.131:8080/</EhrApiUrl>
  <!--ehr的登入地址（重定向到本工程的登入页）-->
  <LoginUrl>http://ehr.yihu.com/wlyyfz/auth/login.html?redirect_url=http://localhost:8080/JkEdu/ssoLogin.html</LoginUrl>
  <LoginUrl>http://172.19.103.87:9088/wlyyfz/auth/login.html?redirect_url=http://192.168.131.131:8088/JkEdu/ssoLogin.html</LoginUrl>
</Config>

edu-article/WsPlatform/WEB-INF/classes/route/JkEdu.xml

@@ -4,7 +4,8 @@
<module name="JkEdu.Behavior" remoteClass="com.yihu.jk.api.BehaviorApi"></module>
<module name="JkEdu.Subscrive" remoteClass="com.yihu.jk.api.SubscriveApi"></module>
<module name="JkEdu.Category" remoteClass="com.yihu.jk.api.CategoryApi"></module>
<module name="JkEdu.ConfigDicSho" remoteClass="com.yihu.jk.api.ConfigDicShoApi"></module>
<module name="JkEdu.ArticleQR" remoteClass="com.yihu.jk.api.getArticleQRCodeApi"></module>
</Mapping>
<Route url="url.JkEdu"></Route>
</Config>

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/PrenatalInspectorPlanDao.java

@@ -25,7 +25,7 @@ public interface PrenatalInspectorPlanDao extends PagingAndSortingRepository<Pre
    //应产检时间前14天后14天待产检计划(不包括应产检当天)
    @Query(value = "SELECT a.* FROM wlyy_prenatal_inspector_plan a, (SELECT t.* from wlyy_prenatal_inspector_plan t where t.id = ?1 )b  " +
            " WHERE a.inspection_time >= DATE_ADD(b.inspection_time,INTERVAL -14 DAY) and a.inspection_time <= DATE_ADD(b.inspection_time,INTERVAL 14 DAY) " +
            "and a.inspection_time != b.inspection_time ORDER BY a.inspection_time DESC ",nativeQuery = true)
            " and a.inspection_time != b.inspection_time and a.patient = b.patient ORDER BY a.inspection_time DESC ",nativeQuery = true)
    List<PrenatalInspectorPlan> getScopeById(Long prenatalId);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/ylz/ThirdEHCService.java

@@ -1,106 +0,0 @@
package com.yihu.wlyy.service.third.ylz;
import com.alibaba.fastjson.JSONObject;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.ylz.PayLog;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.ylz.PayLogDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.system.SystemDictService;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.wechat.util.WeiXinAccessTokenUtils;
import com.yihu.wlyy.wechat.util.WeiXinOpenIdUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.procedure.spi.ParameterRegistrationImplementor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
 * Created by Reece on 2017/9/20.
 * 日志服务
 */
@Service
public class ThirdEHCService extends BaseService {
    private static Logger logger = LoggerFactory.getLogger(ThirdEHCService.class);
    @Autowired
    private PayLogDao payLogDao;
    @Autowired
    private PushMsgTask pushMsgTask;
    @Autowired
    private PatientDao patientDao;
    /**
     *公众号消息推送接口
     */
    public String pushMessage(JSONObject json) {
        String flag = "0000";
        try {
            logger.info("push message "+ json);
            org.json.JSONObject model = new org.json.JSONObject();
            String url = null;
            model.put("remark", "产检内容以医生实际检查为准。点击进行预约");
            model.put("first", "电子健康卡提醒");
            model.put("url",url);
            model.put("keyword1", "电子健康卡提醒");
            json.put("keyword2", "电子健康卡推送");
            String messageType = json.containsKey("message_type") ? json.getString("message_type") : null;
            JSONObject messageContent = json.containsKey("message_content") ? json.getJSONObject("message_content") : null;
            String idType = json.containsKey("id_type") ? json.getString("id_type") : null;
            String idNo = json.containsKey("id_no") ? json.getString("id_no") : null;
            String openId = json.containsKey("open_id") ? json.getString("open_id") : null;
            if (idNo == null && openId ==null) {
                return "0001";
            }
            if (idNo != null) {
                Patient patient = patientDao.findByIdcard(idNo);
                pushMsgTask.putAgentWxMsg(patient.getCode(), 18, model);
            }
            if (StringUtils.isNotEmpty(openId) && !"undefined".equals(openId)) {
                List<Patient> patients = patientDao.findPatientByOpenid(openId);
                for (Patient patient : patients) {
                    Patient patient1 = patientDao.findByCode(patient.getCode());
                    pushMsgTask.putAgentWxMsg(patient1.getCode(), 18, model);
                }
            }
        } catch (Exception ex) {
            ex.printStackTrace();
            flag = "1000";
        }
        return flag;
    }
    /**
     * 保存http调用日志  type 0家庭签约支付 1续方支付
     */
    public void saveHttpLog(Boolean isSuccess, String url, String content, String method, String header, String params, String response, String error, String type) {
        try {
            //新增日志
            PayLog log = new PayLog();
            log.setType(type);
            log.setApi(url);
            log.setContent(content);
            log.setMethod(method);
            log.setHeader(header);
            log.setParams(params);
            log.setCreateTime(new Date());
            log.setResponse(response);
            log.setError(error);
            log.setStatus(isSuccess ? "1" : "0");
            payLogDao.save(log);
        } catch (Exception ex) {
            ex.printStackTrace();
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/ylz/ThirdMessageService.java

@@ -0,0 +1,113 @@
package com.yihu.wlyy.service.third.ylz;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.wechat.util.WeiXinAccessTokenUtils;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * Created by Reece on 2017/9/20.
 * 第三方消息功能
 */
@Service
public class ThirdMessageService extends BaseService {
    private static Logger logger = LoggerFactory.getLogger(ThirdMessageService.class);
    @Autowired
    private WeiXinAccessTokenUtils accessTokenUtils;
    @Autowired
    private PushMsgTask pushMsgTask;
    @Autowired
    private PatientDao patientDao;
    /**
     * 公众号消息推送接口
     */
    public JSONObject pushMessage(int type, JSONObject json) throws Exception {
        JSONObject response = new JSONObject();
        response.put("ret_code", "0000");
        response.put("ret_msg", "操作成功");
        try {
            String openId = json.has("openId") ? json.getString("openId") : null;
            JSONObject messageContent = json.has("messageContent") ? json.getJSONObject("messageContent") : null;
            String name = json.has("name") ? json.getString("name") : null;
            if (StringUtils.isEmpty(openId)) {
                response.put("ret_code", "0001");
                response.put("ret_msg", "openId参数不能为空！");
                return response;
            }
            if (messageContent == null) {
                response.put("ret_code", "0002");
                response.put("ret_msg", "messageContent参数不能为空！");
                return response;
            }
            switch (type) {
                case 0:
                    pushMsgTask.putWxMsg(accessTokenUtils.getAccessToken(), 18, openId, name, messageContent);
                    break;
                case 1:
                    pushMsgTask.putWxMsg(accessTokenUtils.getAccessToken(), 18, openId, name, messageContent);
                    break;
            }
        } catch (Exception ex) {
            ex.printStackTrace();
            response.put("ret_code", "1000");
            response.put("ret_msg", ex.getMessage());
        }
        return response;
    }
    /**
     * 公众号消息推送接口
     */
    public JSONObject physicalExamination(String idCard, String medicalNo, String medicalOrg, String medicalTime) throws Exception {
        JSONObject response = new JSONObject();
        response.put("ret_code", "0000");
        response.put("ret_msg", "操作成功");
        try {
            if (StringUtils.isEmpty(idCard)) {
                response.put("ret_code", "0001");
                response.put("ret_msg", "身份证不能为空！");
            }
            Patient patient = patientDao.findByIdcard(idCard);
            String name = patient.getName();
            String mobile = patient.getMobile();
            String openId = patient.getOpenid();
            JSONObject model = new JSONObject();
            String url = "jkda/html/jiankangtijianxiangqing.html?medicalNo=" + medicalNo;
            model.put("remark", "您可以点击查看报告详情，或通过”健康档案—体检记录“入口查看");
            model.put("first", "您好，您的体检报告已经生成");
            model.put("url", url);
            model.put("keyword1", name);
            model.put("keyword2", StringUtils.isEmpty(mobile) ? "" : mobile);
            model.put("keyword3", medicalNo);
            model.put("keyword4", medicalOrg);
            model.put("keyword5", medicalTime);
            if (StringUtils.isNotEmpty(openId) && !"undefined".equals(openId)) {
                pushMsgTask.putAgentWxMsg(patient.getCode(), 18, model);
            }
        } catch (Exception ex) {
            ex.printStackTrace();
            response.put("ret_code", "1000");
            response.put("ret_msg", ex.getMessage());
        }
        return response;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/template/ThirdMessageController.java

@@ -0,0 +1,77 @@
package com.yihu.wlyy.web.third.template;
import com.yihu.wlyy.service.third.ylz.ThirdMessageService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
 * 提供给第三方消息功能（有token验证无身份登录验证）
 * Created by Reece on 2017/12/7
 */
@RestController
@RequestMapping("/wlyygc/template/")
@Api(description = "第三方模板消息")
public class ThirdMessageController extends BaseController {
    @Autowired
    private ThirdMessageService thirdMessageService;
    /**
     * 公众号消息推送接口（第三方已有openId）
     *
     * @param type 0电子健康注册 1电子健康卡用卡
     * @param data
     * @return
     */
    @ApiOperation("公众号推送接口")
    @RequestMapping(value = "/pushMessage", method = RequestMethod.POST)
    @ResponseBody
    public String pushMessage(@ApiParam(name = "type", defaultValue = "0")
                              @RequestParam(value = "type", required = true) int type,
                              @ApiParam(name = "data", defaultValue = "{ \"openId\": \"o7NFZwynwEkr5JkuVIYkpvYGN9Ic\", \"name\": \"赵卫\", \"messageContent\": { \"first\": \"尊敬的用户，您已成功在中山医院注册居民电子健康卡，请点击领取使用。\", \"remark\": \"请点击领取使用。\", \"url\": \"http://www.baidu.com\", \"keyword1\": \"电子健康卡\", \"keyword2\": \"赵卫\", \"keyword3\": \"2017-12-08 18:00\" } }")
                              @RequestParam(value = "data", required = true) String data) {
        JSONObject param = new JSONObject(data);
        try {
            JSONObject response = thirdMessageService.pushMessage(type, param);
            return write(200, "推送成功！", "data", response);
        } catch (Exception ex) {
            ex.printStackTrace();
            return write(-1, "推送失败！");
        }
    }
    /**
     * 体检提醒模板消息推送接口（第三方没有openId）
     *
     * @param idCard 居民身份证号
     * @param medicalNo   体检号
     * @param medicalOrg   体检机构
     * @param medicalTime 体检时间
     * @return
     */
    @ApiOperation("体检提醒模板消息")
    @RequestMapping(value = "/physicalExamination", method = RequestMethod.POST)
    @ResponseBody
    public String physicalExamination(
            @ApiParam(name = "idCard", defaultValue = "360403195512282415")
            @RequestParam(value = "idCard", required = true) String idCard,
            @ApiParam(name = "medicalNo", defaultValue = "201712111825")
            @RequestParam(value = "medicalNo", required = true) String medicalNo,
            @ApiParam(name = "medicalOrg", defaultValue = "201712111825")
            @RequestParam(value = "medicalOrg", required = true) String medicalOrg,
            @ApiParam(name = "medicalTime", defaultValue = "2017-12-11 20:30")
            @RequestParam(value = "medicalTime", required = true) String medicalTime) {
        try {
            JSONObject response = thirdMessageService.physicalExamination(idCard, medicalNo, medicalOrg, medicalTime);
            return write(200, "推送成功！", "data", response);
        } catch (Exception ex) {
            ex.printStackTrace();
            return write(-1, "推送失败！");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/template/ThirdTemplateController.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
/**
 * 第三方推往健康模板消息
 * 第三方推往健康模板消息（无token验证无身份登录验证）
 * Created by Reece on 2017/11/14.
 */
@Controller

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/ylzpay/ThirdEHCController.java

@@ -1,49 +0,0 @@
package com.yihu.wlyy.web.third.ylzpay;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.wlyy.service.app.health.HealthEduArticleService;
import com.yihu.wlyy.service.third.ylz.ThirdEHCService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
 * 提供给易联众电子健康卡功能
 * Created by Reece on 2017/12/7
 *
 */
@RestController
@RequestMapping("/wlyygc/ehc/")
@Api(description = "易联众电子健康卡")
public class ThirdEHCController extends BaseController {
	
	@Autowired
	private ThirdEHCService thirdEHCService;
	/**
	 *公众号消息推送接口
	 * @param data
	 * @return
	 */
	@ApiOperation("公众号推送接口")
	@RequestMapping(value = "/pushMessage",method = RequestMethod.POST)
	@ResponseBody
	public JSON pushMessage(@ApiParam(name="data",value="推送json串",defaultValue = "{\"message_type\":\"01\",\"message_content\":{\"content\":\"尊敬的用户，您已成功在中山医院注册居民电子健康卡，请点击领取使用。\"},\"id_type\":\"01\",\"id_no\":\"350322199008207716\",\"open_id\":\"14552525252\"}")
								@RequestParam(value="data",required = true) String data) {
		JSONObject response = new JSONObject();
		try {
			String res = thirdEHCService.pushMessage(JSON.parseObject(data));
			response.put("ret_code",res);
			response.put("ret_msg","操作成功");
		} catch (Exception ex) {
			error(ex);
			response.put("ret_code","0001");
			response.put("ret_msg","操作失败");
		}
		return response;
	}
}