三院知识库后台配置接口开发完成

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

@@ -1,6 +1,7 @@
package com.yihu.jw.article.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.article.dao.*;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
@@ -11,6 +12,7 @@ import com.yihu.jw.entity.base.menu.BaseMenuDictUserDO;
import com.yihu.jw.entity.base.menu.BaseMenuShowDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.patient.dao.BasePatientDao;
@@ -52,6 +54,8 @@ public class BaseMenuManageService {
    private BasePatientDao patientDao;
    @Autowired
    private BaseDoctorDao doctorDao;
    @Autowired
    private KnowledgeArticleUserDao knowledgeArticleUserDao;
    /**
@@ -198,16 +202,6 @@ public class BaseMenuManageService {
                    map.put("menuLocationName",wlyyHospitalSysDictDO.getDictValue());
                }
            }
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:menuLocation){
                if (map.get("menuLocation").toString().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                    map.put("menuLocationName",wlyyHospitalSysDictDO.getDictValue());
                }
            }
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:releaseType){
                if (map.get("releaseType").toString().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                    map.put("releaseTypeName",wlyyHospitalSysDictDO.getDictValue());
                }
            }
            for (Map<String,Object> mapchild:list){
                if (mapchild.get("parentId").toString().equalsIgnoreCase(map.get("id").toString())){
                    List<String> list1 = new ArrayList<>();
@@ -259,18 +253,6 @@ public class BaseMenuManageService {
                    baseMenuDictDO.setLocaTionName(menuLocation.getDictValue());
                }
            }
            if(StringUtils.isNotBlank(baseMenuDictDO.getDoctors())){
                String doctors = "'"+baseMenuDictDO.getDoctors().replace(",","','")+"'";
                String sql = "select * from base_doctor where id in ("+doctors+")";
                List<BaseDoctorDO> doctorDOList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BaseDoctorDO.class));
                baseMenuDictDO.setDoctorList(doctorDOList);
            }
            if(StringUtils.isNotBlank(patient)){
                //点赞收藏相关
            }
        }
        return baseMenuDictDO;
    }
@@ -365,10 +347,6 @@ public class BaseMenuManageService {
                menuOld.setDescribtion(menuDO.getDescribtion());
                menuOld.setMenuTitle(menuDO.getMenuTitle());
                menuOld.setBgImg(menuDO.getBgImg());
                menuOld.setReleaseType(menuDO.getReleaseType());
                menuOld.setDoctors(menuDO.getDoctors());
                menuOld.setAuthor(menuDO.getAuthor());
                menuOld.setMusicUrl(menuDO.getMusicUrl());
                menuOld.setUpdateTime(new Date());
                menuOld.setIsDel("1");
                menuDO = baseMenuDictDao.save(menuOld);
@@ -841,4 +819,240 @@ public class BaseMenuManageService {
        return listParent;
    }
    /**
     * 患者对文章操作
     *
     * @param flag 1点赞2收藏3常用4分享5阅读
     * @param articleId 文章id
     * @param userCode 用户编码
     * @return
     */
    public KnowledgeArticleUserDO updateArticleUser(Integer flag, String articleId, String userCode, Integer status){
        KnowledgeArticleUserDO knowledgeArticleUserDO = knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(articleId,userCode);
        BasePatientDO patientDO = patientDao.findByIdAndDel(userCode,"1");
        KnowledgeArticleDictDO knowledgeArticleDictDO = knowledgeArticleDictDao.findByIdAndDel(articleId);
        if (knowledgeArticleUserDO!=null){
            if (flag==1){
                knowledgeArticleUserDO.setFabulous(status);
                if (status==1){
                    knowledgeArticleDictDO.setFabulous(knowledgeArticleDictDO.getFabulous()+1);
                }else if (status==0){
                    knowledgeArticleDictDO.setFabulous(knowledgeArticleDictDO.getFabulous()-1);
                }
            }else if (flag==2){
                knowledgeArticleUserDO.setCollection(status);
                if (status==1){
                    knowledgeArticleDictDO.setCollection(knowledgeArticleDictDO.getFabulous()+1);
                }else if (status==0){
                    knowledgeArticleDictDO.setCollection(knowledgeArticleDictDO.getFabulous()-1);
                }
            }else if (flag==3){
                knowledgeArticleUserDO.setUsed(status);
                if (status==1){
                    knowledgeArticleDictDO.setUsed(knowledgeArticleDictDO.getUsed()+1);
                }else if (status==0){
                    knowledgeArticleDictDO.setUsed(knowledgeArticleDictDO.getUsed()-1);
                }
            }else if (flag==4){
                knowledgeArticleUserDO.setShare(status);
                if (status==1){
                    knowledgeArticleDictDO.setShare(knowledgeArticleDictDO.getShare()+1);
                }else if (status==0){
                    knowledgeArticleDictDO.setShare(knowledgeArticleDictDO.getShare()-1);
                }
            }else if (flag==5){
                knowledgeArticleUserDO.setIsRead(status);
                if (status==1){
                    knowledgeArticleDictDO.setReadCount(knowledgeArticleDictDO.getReadCount()+1);
                }else if (status==0){
                    knowledgeArticleDictDO.setReadCount(knowledgeArticleDictDO.getReadCount()-1);
                }
            }
            knowledgeArticleUserDO = knowledgeArticleUserDao.save(knowledgeArticleUserDO);
            knowledgeArticleDictDao.save(knowledgeArticleDictDO);
        }else {
            knowledgeArticleUserDO = new KnowledgeArticleUserDO();
            knowledgeArticleUserDO.setUser(userCode);
            knowledgeArticleUserDO.setUserName(patientDO.getName());
            knowledgeArticleUserDO.setDel(1);
            knowledgeArticleUserDO.setRelationType(1);
            knowledgeArticleUserDO.setRelationName(knowledgeArticleDictDO.getTitle());
            knowledgeArticleUserDO.setRelationCode(articleId);
            knowledgeArticleUserDO.setCreateTime(new Date());
            knowledgeArticleUserDO.setUpdateTime(new Date());
            knowledgeArticleUserDO.setFabulous(0);
            knowledgeArticleUserDO.setIsRead(0);
            knowledgeArticleUserDO.setUsed(0);
            knowledgeArticleUserDO.setShare(0);
            knowledgeArticleUserDO.setCollection(0);
            if (flag==1){
                knowledgeArticleUserDO.setFabulous(status);
                if (status==1){
                    knowledgeArticleDictDO.setFabulous(knowledgeArticleDictDO.getFabulous()+1);
                }else if (status==0){
                    knowledgeArticleDictDO.setFabulous(knowledgeArticleDictDO.getFabulous()-1);
                }
            }else if (flag==2){
                knowledgeArticleUserDO.setCollection(status);
                if (status==1){
                    knowledgeArticleDictDO.setCollection(knowledgeArticleDictDO.getFabulous()+1);
                }else if (status==0){
                    knowledgeArticleDictDO.setCollection(knowledgeArticleDictDO.getFabulous()-1);
                }
            }else if (flag==3){
                knowledgeArticleUserDO.setUsed(status);
                if (status==1){
                    knowledgeArticleDictDO.setUsed(knowledgeArticleDictDO.getUsed()+1);
                }else if (status==0){
                    knowledgeArticleDictDO.setUsed(knowledgeArticleDictDO.getUsed()-1);
                }
            }else if (flag==4){
                knowledgeArticleUserDO.setShare(status);
                if (status==1){
                    knowledgeArticleDictDO.setShare(knowledgeArticleDictDO.getShare()+1);
                }else if (status==0){
                    knowledgeArticleDictDO.setShare(knowledgeArticleDictDO.getShare()-1);
                }
            }else if (flag==5){
                knowledgeArticleUserDO.setIsRead(status);
                if (status==1){
                    knowledgeArticleDictDO.setReadCount(knowledgeArticleDictDO.getReadCount()+1);
                }else if (status==0){
                    knowledgeArticleDictDO.setReadCount(knowledgeArticleDictDO.getReadCount()-1);
                }
            }
            knowledgeArticleUserDO = knowledgeArticleUserDao.save(knowledgeArticleUserDO);
            knowledgeArticleDictDao.save(knowledgeArticleDictDO);
        }
        return knowledgeArticleUserDO;
    }
    /**
     * 查询患者关注文章列表分类
     *
     * @param userCode 用户id
     * @param flag 1点赞2收藏3常用4分享5阅读
     * @param status 1或者0
     * @return
     */
    public List<Map<String,Object>> selectMenuList(String userCode,Integer flag,Integer status){
        String sql = "SELECT\n" +
                "\tkad.category_first as categoryFirst,\n" +
                "\tkad.category_first_name as categoryFirstName,\n" +
                "\tkad.category_second as categorySecond,\n" +
                "\tkad.category_second_name as categorySecondName \n" +
                "FROM\n" +
                "\twlyy_knowledge_article_user kau\n" +
                "LEFT JOIN wlyy_knowledge_article_dict kad ON kad.id = kau.relation_code\n" +
                "WHERE\n" +
                "\tkau.user_code = '"+userCode+"' AND kad.category_second IN(SELECT md.id from base_menu_dict md where md.status=1 and md.is_del= 1)  ";
        String condition = "";
        if (flag==1){
            condition+=" and kau.fabulous = "+status;
        }
        if (flag==2){
            condition+=" and kau.collection = "+status;
        }
        if (flag==3){
            condition+=" and kau.used = "+status;
        }
        if (flag==4){
            condition+=" and kau.is_share = "+status;
        }
        if (flag==5){
            condition+=" and kau.is_read = "+status;
        }
        condition += "  GROUP BY kad.category_first ";
        List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sql+condition);
        return mapList;
    }
    /**
     * 查询患者关注文章列表分类
     *
     * @param userCode 用户id
     * @param flag 1点赞2收藏3常用4分享5阅读
     * @param status 1或者0
     * @return
     */
    public JSONObject selectArticleListByCategory(String categoryFirst,String categorySecond,String userCode,Integer flag,Integer status,Integer page,Integer size){
        String sql = "SELECT kad.category_first as categoryFirst,\n" +
                "\tkad.category_first_name as categoryFirstName,\n" +
                "\tkad.category_second as categorySecond,\n" +
                "\tkad.category_second_name as categorySecondName,\n" +
                "\tkad.id as id,\n" +
                "\tkad.title as title,\n" +
                "\tkad.intro as intro,\n" +
                "\tkad.content as content,\n" +
                "\tkad.image as image,\n" +
                "\tkad.img as img,\n" +
                "\tkad.puplish_type as puplishType,\n" +
                "\tkad.puplish_type_name as puplishTypeName,\n" +
                "\tkad.vedio_url as vedioUrl,\n" +
                "\tkad.create_user as createUser,\n" +
                "\tkad.create_user_name as createUserName,\n" +
                "\tkad.source as source \n" +
                "FROM\n" +
                "\twlyy_knowledge_article_user kau\n" +
                "LEFT JOIN wlyy_knowledge_article_dict kad ON kad.id = kau.relation_code  \n" +
                "WHERE\n" +
                "\tkau.user_code = '"+userCode+"' AND kad.category_second IN(SELECT md.id from base_menu_dict md where md.status=1 and md.is_del= 1)  ";
        String condition = "";
        if (StringUtils.isNoneBlank(categoryFirst)){
            condition =" and kad.category_first = '"+categoryFirst+"' ";
        }
        if (StringUtils.isNoneBlank(categorySecond)){
            condition =" and kad.category_second ='"+categorySecond+"' ";
        }
        if (flag==1){
            condition+=" and kau.fabulous = "+status;
        }
        if (flag==2){
            condition+=" and kau.collection = "+status;
        }
        if (flag==3){
            condition+=" and kau.used = "+status;
        }
        if (flag==4){
            condition+=" and kau.is_share = "+status;
        }
        if (flag==5){
            condition+=" and kau.is_read = "+status;
        }
        condition += " order by  kau.create_time desc ";
        List<Map<String,Object>> mapList = hibenateUtils.createSQLQuery(sql+condition,page,size);
        String sqlTotal = "SELECT count(1) as total "+
                "FROM\n" +
                "\twlyy_knowledge_article_user kau\n" +
                "LEFT JOIN wlyy_knowledge_article_dict kad ON kad.id = kau.relation_code  \n" +
                "WHERE\n" +
                "\tkau.user_code = '"+userCode+"' ";
        List<Map<String,Object>> mapTotalList = hibenateUtils.createSQLQuery(sqlTotal+condition);
        Long count = 0L;
        if(mapTotalList!=null){
            count = Long.parseLong(mapTotalList.get(0).get("total").toString());
        }
        JSONObject object = new JSONObject();
        object.put("data",mapList);
        object.put("page",page);
        object.put("size",size);
        object.put("total",count);
        return object;
    }
    /**
     * 查询患者关联的文章
     * @param userCode
     * @param articleId
     * @return
     */
    public KnowledgeArticleUserDO findArticleUserById(String userCode,String articleId){
        return knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(articleId,userCode);
    }
}

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

@@ -12,6 +12,7 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.menu.BaseMenuDictDO;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDeptDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
@@ -24,6 +25,7 @@ import com.yihu.jw.hospital.survey.dao.SurveyTemplateDao;
import com.yihu.jw.hospital.survey.dao.SurveyUserDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.patient.dao.BasePatientBusinessDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.user.UserDao;
import com.yihu.jw.utils.EntityUtils;
@@ -70,6 +72,10 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
    private HibenateUtils hibenateUtils;
	@Autowired
	private UserDao userDao;
	@Autowired
	private BasePatientDao patientDao;
	//查询文章列表
	public List<Map<String,Object>> findArticleList(String first,String second,Integer type ,String key,Integer page ,Integer pageSize){
		String sql ="select b.id as \"id\", " +
@@ -152,6 +158,11 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
			knowledgeArticleDO.setReleaseStatus(0);
			knowledgeArticleDO.setDel(1);
			knowledgeArticleDO.setType(type);
			knowledgeArticleDO.setFabulous(0);
			knowledgeArticleDO.setReadCount(0);
			knowledgeArticleDO.setUsed(0);
			knowledgeArticleDO.setCollection(0);
			knowledgeArticleDO.setIsUsed(0);
			if(type==1){
				UserDO userDO = userDao.findById(knowledgeArticleDO.getCreateUser()).orElse(null);;
				if (userDO!=null){
@@ -183,8 +194,13 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
			one.setCategorySecondName(knowledgeArticleDO.getCategorySecondName());
			one.setReleaseTime(knowledgeArticleDO.getReleaseTime());
			one.setStatus(0);
			one.setPuplishType(knowledgeArticleDO.getPuplishType());
			one.setPuplishTypeName(knowledgeArticleDO.getPuplishTypeName());
			one.setSource(knowledgeArticleDO.getSource());
			one.setUrl(knowledgeArticleDO.getUrl());
			one.setVedioUrl(knowledgeArticleDO.getVedioUrl());
			one.setRecommendDoctor(knowledgeArticleDO.getRecommendDoctor());
			one.setRecommendDoctorName(knowledgeArticleDO.getRecommendDoctorName());
			if (!articleNeedCheck){
				one.setStatus(1);
				one.setReleaseStatus(1);
@@ -491,4 +507,6 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
		result.put("detailModelList",list);
		return result;
	}
}

business/base-service/src/main/java/com/yihu/jw/file_upload/FileUploadService.java

@@ -678,7 +678,7 @@ public class FileUploadService {
            type = type.substring(type.lastIndexOf("."),type.length()-1);
        }
        logger.info(type);
        List img = new ArrayList(Arrays.asList("jpeg","bmp", "jpg", "png", "tif", "gif", "pcx", "tga", "exif", "fpx", "svg", "psd", "cdr", "pcd", "dxf", "ufo", "eps", "ai", "raw", "WMF", "webp","xls","xlsx","text/plain","mp4","m4v","avi","ogm","wmv","mpg","webm","ogv","mov","asx","mpeg","image/png","amr"));
        List img = new ArrayList(Arrays.asList("jpeg","bmp", "jpg", "png", "tif", "gif", "pcx", "tga", "exif", "fpx", "svg", "psd", "cdr", "pcd", "dxf", "ufo", "eps", "ai", "raw", "WMF", "webp","xls","xlsx","text/plain","mp3","mp4","m4v","avi","ogm","wmv","mpg","webm","ogv","mov","asx","mpeg","image/png","amr"));
        if (!img.contains(type)) {
            return false;
        }

common/common-entity/src/main/java/com/yihu/jw/entity/base/menu/BaseMenuDictDO.java

@@ -33,11 +33,6 @@ public class BaseMenuDictDO extends UuidIdentityEntityWithOperator {
    private String bgImg;//背景图片
    private String menuTitle;//标题
    private String describtion;//描述
    private String releaseType;//发布类型 1图文 2视频 3音频
    private String releaseTypeName;//发布类型 1图文 2视频 3音频
    private String musicUrl;//音频
    private String doctors;//推荐医生 多个逗号间隔
    private String author;//来源、作者
    private Integer type;//类型 1 官网菜单 2app文章菜单
    private List<BaseDoctorDO> doctorList;//推荐医生
@@ -231,41 +226,6 @@ public class BaseMenuDictDO extends UuidIdentityEntityWithOperator {
        this.type = type;
    }
    @Column(name = "release_type")
    public String getReleaseType() {
        return releaseType;
    }
    public void setReleaseType(String releaseType) {
        this.releaseType = releaseType;
    }
    @Column(name = "music_url")
    public String getMusicUrl() {
        return musicUrl;
    }
    public void setMusicUrl(String musicUrl) {
        this.musicUrl = musicUrl;
    }
    @Column(name = "doctors")
    public String getDoctors() {
        return doctors;
    }
    public void setDoctors(String doctors) {
        this.doctors = doctors;
    }
    @Column(name = "author")
    public String getAuthor() {
        return author;
    }
    public void setAuthor(String author) {
        this.author = author;
    }
    @Transient
    public List<BaseDoctorDO> getDoctorList() {
@@ -276,15 +236,6 @@ public class BaseMenuDictDO extends UuidIdentityEntityWithOperator {
        this.doctorList = doctorList;
    }
    @Transient
    public String getReleaseTypeName() {
        return releaseTypeName;
    }
    public void setReleaseTypeName(String releaseTypeName) {
        this.releaseTypeName = releaseTypeName;
    }
    @Transient
    public Integer getCollection() {
        return collection;

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

@@ -46,6 +46,7 @@ public class KnowledgeArticleDO extends UuidIdentityEntity {
	private String intro;//简介
	private Integer isShow;//显示首页：1显示0不显示
	@Transient
	private Integer isUsed;//是否已设置常用
@@ -286,4 +287,6 @@ public class KnowledgeArticleDO extends UuidIdentityEntity {
	public void setIsShow(Integer isShow) {
		this.isShow = isShow;
	}
}

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

@@ -8,6 +8,8 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 * 官网-文章
@@ -51,6 +53,17 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	@Transient
	private Integer isUsed;//是否已设置常用
	private Integer puplishType;//1、图文2、视频3、音频
	private String puplishTypeName;//1、图文2、视频3、音频
	private String recommendDoctor;//推荐医生，以逗号隔开
	private String recommendDoctorName;//推荐医生，以逗号隔开
	private  List<Map<String,Object>> doctorList;//推荐医生信息
	@Transient
	private KnowledgeArticleUserDO knowledgeArticleUserDO;
@@ -64,6 +77,49 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	private Integer releaseStatus;
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date releaseTime;
	public String getRecommendDoctorName() {
		return recommendDoctorName;
	}
	public void setRecommendDoctorName(String recommendDoctorName) {
		this.recommendDoctorName = recommendDoctorName;
	}
	@Transient
	public List<Map<String, Object>> getDoctorList() {
		return doctorList;
	}
	public void setDoctorList(List<Map<String, Object>> doctorList) {
		this.doctorList = doctorList;
	}
	public Integer getPuplishType() {
		return puplishType;
	}
	public void setPuplishType(Integer puplishType) {
		this.puplishType = puplishType;
	}
	public String getPuplishTypeName() {
		return puplishTypeName;
	}
	public void setPuplishTypeName(String puplishTypeName) {
		this.puplishTypeName = puplishTypeName;
	}
	public String getRecommendDoctor() {
		return recommendDoctor;
	}
	public void setRecommendDoctor(String recommendDoctor) {
		this.recommendDoctor = recommendDoctor;
	}
	@Column(name = "release_time")
	public Date getReleaseTime() {
		return releaseTime;

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1229,6 +1229,14 @@ public class BaseHospitalRequestMapping {
        public static final String findArticleByCategoryAndName  = "/findArticleByCategoryAndName";
        public static final String getArticleGroup  = "/getArticleGroup";
        public static final String findPatientFavorite  = "/findPatientFavorite";
        public static final String updateArticleUser= "/updateArticleUser";
        public static final String selectMenuList= "/selectMenuList";
        public static final String selectArticleListByCategory= "/selectArticleListByCategory";
        public static final String findArticleUserById= "/findArticleUserById";
    }
    /**

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

@@ -373,4 +373,6 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			return failedException(e);
		}
	}
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/menu/BaseMenuNoLoginEndpoint.java

@@ -3,6 +3,7 @@ package com.yihu.jw.base.endpoint.menu;
import com.yihu.jw.article.dao.KnowledgeArticleDictDao;
import com.yihu.jw.article.service.BaseMenuManageService;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.healthCare.utils.StringUtils;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -10,12 +11,15 @@ 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.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping(value = BaseRequestMapping.MenuNologin.PREFIX)
@@ -25,6 +29,8 @@ public class BaseMenuNoLoginEndpoint extends EnvelopRestEndpoint {
    private BaseMenuManageService menuService;
    @Resource
    private KnowledgeArticleDictDao knowledgeArticleDictDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @GetMapping(value = BaseRequestMapping.MenuNologin.findAllMenu)
    @ApiOperation(value = "查询首页列表")
@@ -79,6 +85,20 @@ public class BaseMenuNoLoginEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "id", required = true)String id) throws Exception{
        try {
            KnowledgeArticleDictDO articleDO = knowledgeArticleDictDao.findById(id).orElse(null);
            String recommendDoctor = articleDO.getRecommendDoctor();
            if (recommendDoctor!=null&&recommendDoctor!=""){
                recommendDoctor = recommendDoctor.replace(",","','");
                String sql = "select d.id,\n" +
                        "\td.NAME as name,\n" +
                        "\td.job_title_code AS jobTitleCode,\n" +
                        "\td.job_title_name AS jobTitleName,\n" +
                        "\tCONCAT(dh.dept_name) as deptName,\n" +
                        "\td.introduce as introduce,\n" +
                        "\td.expertise as expertise,\n" +
                        "\td.photo from base_doctor d LEFT JOIN base_doctor_hospital dh ON dh.doctor_code= d.id where d.id in ('"+recommendDoctor+"') GROUP BY d.id ";
                List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sql);
                articleDO.setDoctorList(mapList);
            }
            return success(articleDO);
        }catch (Exception e){
            return failedException(e);

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

@@ -17,9 +17,11 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
 * app文章
@@ -39,6 +41,8 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
	private BaseDoctorDao doctorDao;
	@Autowired
	private BaseDoctorRoleDao doctorRoleDao;
	@Autowired
	private JdbcTemplate jdbcTemplate;
	
	@GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.searchKnowledgePageList)
@@ -228,4 +232,6 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
		}
	}
}

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

@@ -508,4 +508,6 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			return failedException2(e);
		}
	}
}

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

@@ -6,6 +6,7 @@ import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -139,4 +140,77 @@ public class BaseMenuManageEndpoint extends EnvelopRestEndpoint {
            return failedException(e);
        }
    }
    @PostMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.updateArticleUser)
    @ApiOperation(value = "患者更新文章状态")
    public Envelop updateArticleUser( @ApiParam(name = "flag", value = "1点赞2收藏3常用4分享5阅读")
                                      @RequestParam(value = "flag",required = false)Integer flag,
                                      @ApiParam(name = "articleId", value = "文章id")
                                      @RequestParam(value = "articleId",required = false)String articleId,
                                      @ApiParam(name = "userCode", value = "用户编码")
                                      @RequestParam(value = "userCode",required = false)String userCode,
                                      @ApiParam(name = "status", value = "对应的状态(0,1)")
                                      @RequestParam(value = "status",required = false)Integer status)throws Exception {
        try {
            return success(menuService.updateArticleUser(flag,articleId,userCode,status));
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.selectMenuList)
    @ApiOperation(value = "查询患者关注文章列表分类")
    public Envelop selectMenuList( @ApiParam(name = "flag", value = "1点赞2收藏3常用4分享5阅读")
                                      @RequestParam(value = "flag",required = false)Integer flag,
                                      @ApiParam(name = "userCode", value = "用户编码")
                                      @RequestParam(value = "userCode",required = false)String userCode,
                                      @ApiParam(name = "status", value = "对应的状态(0,1)")
                                      @RequestParam(value = "status",required = false)Integer status)throws Exception {
        try {
            return success(menuService.selectMenuList(userCode,flag,status));
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.selectArticleListByCategory)
    @ApiOperation(value = "根据分类查找患者关注文章列表")
    public Envelop selectArticleListByCategory( @ApiParam(name = "categoryFirst", value = "一级分类")
                                       @RequestParam(value = "categoryFirst",required = false)String categoryFirst,
                                   @ApiParam(name = "categorySecond", value = "二级分类")
                                   @RequestParam(value = "categorySecond",required = false)String categorySecond,
                                   @ApiParam(name = "flag", value = "1点赞2收藏3常用4分享5阅读")
                                   @RequestParam(value = "flag",required = false)Integer flag,
                                   @ApiParam(name = "userCode", value = "用户编码")
                                   @RequestParam(value = "userCode",required = false)String userCode,
                                   @ApiParam(name = "status", value = "对应的状态(0,1)")
                                   @RequestParam(value = "status",required = false)Integer status,
                                   @ApiParam(name = "page", value = "页码")
                                       @RequestParam(value = "page",required = false)Integer page,
                                   @ApiParam(name = "size", value = "每一页大小")
                                       @RequestParam(value = "size",required = false)Integer size)throws Exception {
        try {
            return success(menuService.selectArticleListByCategory(categoryFirst,categorySecond,userCode,flag,status,page,size));
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.findArticleUserById)
    @ApiOperation(value = "查询患者关联的文章")
    public Envelop selectArticleListByCategory(@ApiParam(name = "userCode", value = "用户编码")
                                                @RequestParam(value = "userCode",required = false)String userCode,
                                                @ApiParam(name = "articleId", value = "文章id")
                                                @RequestParam(value = "articleId",required = false)String articleId)throws Exception {
        try {
            return success(menuService.findArticleUserById(userCode,articleId));
        }catch (Exception e){
            return failedException2(e);
        }
    }
}

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

@@ -2,6 +2,7 @@ package com.yihu.jw.hospital.endpoint.article;
import com.yihu.jw.article.dao.KnowledgeArticleDictDao;
import com.yihu.jw.article.service.BaseMenuManageService;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -9,12 +10,15 @@ 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.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping(value = BaseRequestMapping.MenuNologin.PREFIX)
@@ -24,6 +28,8 @@ public class BaseMenuNoLoginEndpoint extends EnvelopRestEndpoint {
    private BaseMenuManageService menuService;
    @Resource
    private KnowledgeArticleDictDao knowledgeArticleDictDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @GetMapping(value = BaseRequestMapping.MenuNologin.findAllMenu)
    @ApiOperation(value = "查询首页列表")
@@ -70,5 +76,31 @@ public class BaseMenuNoLoginEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = BaseRequestMapping.MenuNologin.queryById)
    @ApiOperation(value = "根据id查询文章")
    public Envelop queryByCode(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id", required = true)String id) throws Exception{
        try {
            KnowledgeArticleDictDO articleDO = knowledgeArticleDictDao.findById(id).orElse(null);
            String recommendDoctor = articleDO.getRecommendDoctor();
            if (recommendDoctor!=null&&recommendDoctor!=""){
                recommendDoctor = recommendDoctor.replace(",","','");
                String sql = "select d.id,\n" +
                        "\td.NAME as name,\n" +
                        "\td.job_title_code AS jobTitleCode,\n" +
                        "\td.job_title_name AS jobTitleName,\n" +
                        "\tCONCAT(dh.dept_name) as deptName,\n" +
                        "\td.introduce as introduce,\n" +
                        "\td.expertise as expertise,\n" +
                        "\td.photo from base_doctor d LEFT JOIN base_doctor_hospital dh ON dh.doctor_code= d.id where d.id in ('"+recommendDoctor+"') GROUP BY d.id ";
                List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sql);
                articleDO.setDoctorList(mapList);
            }
            return success(articleDO);
        }catch (Exception e){
            return failedException(e);
        }
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -98,6 +98,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.util.StreamUtils;
import org.springframework.web.bind.annotation.*;
@@ -145,6 +146,8 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    private BaseDoctorInfoService baseDoctorService;
    @Autowired
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Value("${wechat.id}")
    private String wxId;
@@ -924,7 +927,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.queryById)
   /* @GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.queryById)
    @ApiOperation(value = "根据id查询文章")
    public Envelop queryByCode(
            @ApiParam(name = "id", value = "id", required = true)
@@ -942,11 +945,12 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                articleDO.setHospitalName(doctorHospitalDOS.get(0).getOrgName());
                articleDO.setDeptName(doctorHospitalDOS.get(0).getDeptName());
            }
            return success(articleDO);
        }catch (Exception e) {
            return failedException2(e);
        }
    }
    }*/
    @PostMapping(value = BaseHospitalRequestMapping.PatientIM.getSign)

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

@@ -9,8 +9,10 @@ import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDeptDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.survey.WlyySurveyTemplateDO;
@@ -22,6 +24,7 @@ import com.yihu.jw.hospital.survey.dao.SurveyUserDao;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.patient.dao.BasePatientBusinessDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.utils.EntityUtils;
import com.yihu.jw.utils.hibernate.HibenateUtils;
@@ -65,6 +68,8 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
	private SurveyTemplateDao surveyTemplateDao;
	@Autowired
    private HibenateUtils hibenateUtils;
	@Autowired
	private BasePatientDao patientDao;
	
	/**
	 * 删除，支持批量
@@ -426,4 +431,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
		result.put("detailModelList",list);
		return result;
	}
}