代码修改

business/base-service/src/main/java/com/yihu/jw/article/service/BaseMenuManageService.java

@@ -19,7 +19,6 @@ import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.utils.DmDBUtl;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -809,7 +808,7 @@ public class BaseMenuManageService {
                "  read_count,\n" +
                "  collection,\n" +
                "  fabulous,\n" +
                DmDBUtl.changeField("comment",wxId)+"  ," +
                "  comment_num as \"comment\",\n" +
                "  is_share,\n" +
                "  create_user_name   ,\n" +
                "  create_user_dept   ,\n" +

business/base-service/src/main/java/com/yihu/jw/article/service/KnowledgeArticleDictService.java

@@ -29,7 +29,6 @@ import com.yihu.jw.utils.EntityUtils;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -136,21 +135,11 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
	public KnowledgeArticleDictDO findById(String id){
		String sql = "select * from wlyy_knowledge_article_dict where id ='"+id+"'";
		List<KnowledgeArticleDictDO> dictDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
		if(dictDOS.size()>0){
			return dictDOS.get(0);
		}
		return null;
		return knowledgeArticleDictDao.findById(id).orElse(null);
	}
	public KnowledgeArticleDictDO findByIdAndDel(String id){
		String sql = "select * from wlyy_knowledge_article_dict where id ='"+id+"' and del=1";
		List<KnowledgeArticleDictDO> dictDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
		if(dictDOS.size()>0){
			return dictDOS.get(0);
		}
		return null;
		return knowledgeArticleDictDao.findByIdAndDel(id);
	}
	/**
@@ -168,7 +157,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
				articleNeedCheck=false;
			}
		}
		if (!StringUtils.isNotBlank(knowledgeArticleDO.getId()) ) {
		if (StringUtils.isBlank(knowledgeArticleDO.getId()) ) {
			// 新增
			knowledgeArticleDO.setId(UUID.randomUUID().toString().replace("-", ""));
			knowledgeArticleDO.setCreateTime(new Date());

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/article/KnowledgeArticleDictDO.java

@@ -47,6 +47,7 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	private Integer collection;//收藏数量
	private Integer fabulous;//点赞数量
	@Column(name = "comment_num")
	private Integer comment;//评论数量
	@Column(name = "is_share")
	private Integer share;//分享 数量
@@ -420,6 +421,7 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
		this.url = url;
	}
	@Column(name = "comment_num")
	public Integer getComment() {
		return comment;
	}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/article/ArticleEndpoint.java

@@ -23,7 +23,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.*;
@@ -68,10 +67,6 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize)throws Exception{
		try {
			String sql = "select * ";
			String countSql = "select count(*) ";
			String filter = " from wlyy_knowledge_article_dict where type=1 and del=1 ";
			String userId=getUID();
			UserDO userDO = userdao.findById(userId).orElse(null);
			boolean queryAll=false;
@@ -85,30 +80,25 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
					}
				}
			}
			if (!queryAll){
				filter += " and create_user='"+userId+"'";
			}
			//title?1111;categoryFirst=402803e879a2699d0179a27f3fa10001;categorySecond=402803e879a2699d0179a28c64d50007
			if(StringUtils.isNotBlank(filters)){
				String fil[] = fields.split(";");
				for (String fi:fil){
					if(fi.contains("title?")){
						filter += " and title like '%"+fi.split("\\?")[1]+"%'";
					}
					if(fi.contains("categoryFirst=")){
						filter += " and category_first='"+fi.split("=")[1]+"'";
					}
					if(fi.contains("categorySecond=")){
						filter += " and category_second='"+fi.split("=")[1]+"'";
					}
			if (queryAll){
				if(StringUtils.isBlank(filters)){
					filters=filters+"del=1";
				}else{
					filters=filters+";del=1";
				}
			}else {
				if(StringUtils.isBlank(filters)){
					filters=filters+"del=1"+";createUser="+userId+"";
				}else{
					filters=filters+";del=1"+";createUser="+userId+"";
				}
			}
			String orderBy = " order by create_time desc limit "+(page-1)*pageSize+","+pageSize;
			filters += ";type=1";
			List<KnowledgeArticleDictDO> list  = knowledgeArticleDictService.search(fields,filters,sorts,page,pageSize);
			List<KnowledgeArticleDictDO> totals  = knowledgeArticleDictService.search(fields,filters,sorts);
			List<KnowledgeArticleDictDO> list  = jdbcTemplate.query(sql+filter+orderBy,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
			long total  = jdbcTemplate.queryForObject(countSql+filter,Long.class);
			JSONObject result = new JSONObject();
			result.put("total",total);
			result.put("total",totals.size());
			result.put("detailModelList",list);
			return success(result);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/article/ArticleDictEndpoint.java

@@ -16,8 +16,8 @@ import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.*;
@@ -60,38 +60,28 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
			@ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
			@RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize)throws Exception{
		try {
			String sql = "select * ";
			String countSql = "select count(*) ";
			String filter = " from wlyy_knowledge_article_dict where type=2 and del=1 ";
			String userId=getUID();
			BaseDoctorRoleDO roleDO = doctorRoleDao.findByDoctorCodeAndRoleCode(userId, CommonContant.DR_ARTICLEREVIEWER);
			boolean queryAll=false;
			if (roleDO!=null){
				queryAll=true;
			}
			if (!queryAll){
				filter += " and create_user='"+userId+"'";
			}
			//title?1111;categoryFirst=402803e879a2699d0179a27f3fa10001;categorySecond=402803e879a2699d0179a28c64d50007
			if(org.apache.commons.lang3.StringUtils.isNotBlank(filters)){
				String fil[] = fields.split(";");
				for (String fi:fil){
					if(fi.contains("title?")){
						filter += " and title like '%"+fi.split("\\?")[1]+"%'";
					}
					if(fi.contains("categoryFirst=")){
						filter += " and category_first='"+fi.split("=")[1]+"'";
					}
					if(fi.contains("categorySecond=")){
						filter += " and category_second='"+fi.split("=")[1]+"'";
					}
			if (queryAll){
				if(StringUtils.isBlank(filters)){
					filters=filters+"del=1";
				}else{
					filters=filters+";del=1";
				}
			}else {
				if(StringUtils.isBlank(filters)){
					filters=filters+"del=1"+";createUser="+userId+"";
				}else{
					filters=filters+";del=1"+";createUser="+userId+"";
				}
			}
			String orderBy = " order by create_time desc limit "+(page-1)*pageSize+","+pageSize;
			List<KnowledgeArticleDictDO> list  = jdbcTemplate.query(sql+filter+orderBy,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
			filters += ";type=2";
			List<KnowledgeArticleDictDO> list  = knowledgeArticleDictService.search(fields,filters,sorts,page,pageSize);
			for (KnowledgeArticleDictDO articleDictDO:list){
				JSONObject object = menuManageService.findArticleStaticsByArticleId(articleDictDO.getId());
				if (object!=null){
@@ -100,10 +90,10 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
					articleDictDO.setFabulous(Integer.parseInt(object.getString("eulogyTotal")));
				}
			}
			long total  = jdbcTemplate.queryForObject(countSql+filter,Long.class);
			List<KnowledgeArticleDictDO> totals  = knowledgeArticleDictService.search(fields,filters,sorts);
			JSONObject result = new JSONObject();
			result.put("total",total);
			result.put("total",totals.size());
			result.put("detailModelList",list);
			return success(result);
@@ -234,29 +224,16 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize)throws Exception{
		try {
			String sql = "select * ";
			String countSql = "select count(*) ";
			String filter = " from wlyy_knowledge_article_dict where type=2 and del=1 and status=1 ";
			if(org.apache.commons.lang3.StringUtils.isNotBlank(filters)){
				String fil[] = fields.split(";");
				for (String fi:fil){
					if(fi.contains("title?")){
						filter += " and title like '%"+fi.split("\\?")[1]+"%'";
					}
					if(fi.contains("categoryFirst=")){
						filter += " and category_first='"+fi.split("=")[1]+"'";
					}
					if(fi.contains("categorySecond=")){
						filter += " and category_second='"+fi.split("=")[1]+"'";
					}
				}
			if(StringUtils.isBlank(filters)){
				filters=filters+"del=1;type=2;status=1";
			}else{
				filters=filters+";del=1;type=2;status=1";
			}
			String orderBy = " order by create_time desc limit "+(page-1)*pageSize+","+pageSize;
			List<KnowledgeArticleDictDO> list  = jdbcTemplate.query(sql+filter+orderBy,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
			long total  = jdbcTemplate.queryForObject(countSql+filter,Long.class);
			List<KnowledgeArticleDictDO> list  = knowledgeArticleDictService.search(fields,filters,sorts,page,pageSize);
			List<KnowledgeArticleDictDO> totals  = knowledgeArticleDictService.search(fields,filters,sorts);
			JSONObject result = new JSONObject();
			result.put("total",total);
			result.put("total",totals.size());
			result.put("detailModelList",list);
			return success(result);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/article/ArticleEndpoint.java

@@ -116,7 +116,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			try {
				KnowledgeArticleDO articleDO = knowledgeArticleDao.findById(id).orElse(null);
				if(articleDO==null){
					KnowledgeArticleDictDO articleDictDO = knowledgeArticleService.findByIdAndDel(id);
					KnowledgeArticleDictDO articleDictDO = knowledgeArticleDictDao.findByIdAndDel(id);
					KnowledgeArticleUserDO knowledgeArticleUserDO = knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(articleDictDO.getId(),getUID());
					if (knowledgeArticleUserDO!=null){
						articleDictDO.setIsUsed(knowledgeArticleUserDO.getUsed());

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/KnowledgeArticleService.java

@@ -29,7 +29,6 @@ import com.yihu.jw.utils.EntityUtils;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -243,15 +242,6 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
		return true;
	}
	public KnowledgeArticleDictDO findByIdAndDel(String id){
		String sql = "select * from wlyy_knowledge_article_dict where id ='"+id+"' and del=1";
		List<KnowledgeArticleDictDO> dictDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
		if(dictDOS.size()>0){
			return dictDOS.get(0);
		}
		return null;
	}
	/**
	 *	患者接收问卷/文章
	 * @param businessDOS
@@ -277,7 +267,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
					KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findByIdAndDel(patientBusinessDO.getRelationCode());
					JSONObject object = new JSONObject();
					if(knowledgeArticleDO==null){
						KnowledgeArticleDictDO knowledgeArticleDictDO = findByIdAndDel(patientBusinessDO.getRelationCode());
						KnowledgeArticleDictDO knowledgeArticleDictDO = knowledgeArticleDictDao.findByIdAndDel(patientBusinessDO.getRelationCode());
						object.put("id",knowledgeArticleDictDO.getId());
						object.put("title",knowledgeArticleDictDO.getTitle());
						object.put("content",knowledgeArticleDictDO.getIntro());