Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -21,6 +21,7 @@ public class BaseNewsArticleDO extends UuidIdentityEntityWithCreateTime {
    private String statusName;//状态（1生效 0失效）
    private String articleName;//文章名称
    private String image;//文章封面
    private String url;//外链地址
    @Column(name = "article_id")
    public String getArticleId() {
@@ -75,4 +76,13 @@ public class BaseNewsArticleDO extends UuidIdentityEntityWithCreateTime {
    public void setImage(String image) {
        this.image = image;
    }
    @Transient
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
}

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

@@ -30,6 +30,7 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	private String content; // 文章内容
	private String source;  // 文章来源--客服
	private String image;   // 封面图片
	private String url;   // 外链地址
	private String vedioUrl;//视频url
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;  // 添加时间
@@ -316,4 +317,12 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	public void setVedioUrl(String vedioUrl) {
		this.vedioUrl = vedioUrl;
	}
	public String getUrl() {
		return url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/article/KnowledgeArticleService.java

@@ -82,7 +82,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
	 */
	public PageEnvelop<List<Map<String,Object>>> findPageByArticleName(String articleName, Integer page, Integer size){
		String sql = "SELECT a.id,a.sort,cast(a.status as char) status,a.article_id articleId,LEFT(a.create_time,19) createTime,IF(a.status=1,'生效','失效') statusName" +
				",d.title articleName,d.image from base_news_article a,wlyy_knowledge_article_dict d " +
				",d.title articleName,d.image,d.url from base_news_article a,wlyy_knowledge_article_dict d " +
				"WHERE a.article_id = d.id " ;
		String sqlCount = "SELECT count(a.id) from base_news_article a,wlyy_knowledge_article_dict d  " +
@@ -124,6 +124,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
				if(dictDO!=null){
					baseNewsArticleDO.setArticleName(dictDO.getTitle());
					baseNewsArticleDO.setImage(dictDO.getImage());
					baseNewsArticleDO.setUrl(dictDO.getUrl());
				}
			}
			baseNewsArticleDO.setStatusName("1".equals(baseNewsArticleDO.getStatus())?"生效":"失效");
@@ -248,7 +249,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
				articleNeedCheck=false;
			}
		}
		if (!StringUtils.isNotBlank(knowledgeArticleDO.getId()) ) {
		if (StringUtils.isBlank(knowledgeArticleDO.getId()) ) {
			// 新增
			knowledgeArticleDO.setId(UUID.randomUUID().toString().replace("-", ""));
			knowledgeArticleDO.setCreateTime(new Date());
@@ -272,6 +273,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
			one.setImage(knowledgeArticleDO.getImage());
			one.setIntro(knowledgeArticleDO.getIntro());
			one.setUpdateTime(new Date());
			one.setUrl(knowledgeArticleDO.getUrl());
			one.setCategoryFirst(knowledgeArticleDO.getCategoryFirst());
			one.setCategoryFirstName(knowledgeArticleDO.getCategoryFirstName());
			one.setCategorySecond(knowledgeArticleDO.getCategorySecond());

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/config/YsConfig.java

@@ -15,7 +15,7 @@ public class YsConfig {
    /**
     * 监控账号说明：
     * 目前为多个账号 监控设备与账号绑定关系表ys_device、dm_ys_config
     * mobile:13559485270 pwd:zjxl123456*
     * mobile:13559485270 pwd:zjxl@2021
     * mobile:15659713528 pwd:woaini123a*
     * mobile:18770887864 pwd:123456a.
     * pc端 https://es.ys7.com/ys/login