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

business/base-service/src/main/java/com/yihu/jw/dailyReport/service/DailyReportUploadService.java

@@ -28,7 +28,10 @@ import com.yihu.jw.wechat.dao.WxTemplateConfigDao;
import com.yihu.jw.wechat.enterprise.EnterpriseService;
import com.yihu.jw.wechat.enterprise.dao.WxEnterpriseUserDao;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import com.yihu.utils.network.HttpResponse;
import com.yihu.utils.network.HttpUtils;
import jxl.write.*;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -3782,6 +3785,8 @@ public class DailyReportUploadService {
        List<Map<String,Object>> doctorTypeHourList = jdbcTemplate.queryForList(doctorTypeSql);
        result.put("doctorTypeHourList",doctorTypeHourList);//按人员统计总用时与参与人数
        JSONObject bugObj = selectBugTotal(memberId,startDate,endDate,dept);
        result.putAll(bugObj);
        return result;
    }
@@ -5051,4 +5056,73 @@ public class DailyReportUploadService {
        label.setCellFormat(cellFormat);
        ws.addCell(label);
    }
    public JSONObject selectBugTotal(String doctorId, String startDate, String endDate, String dept) throws Exception {
        String sqlCondition = "";
        if (StringUtils.isNoneBlank(dept)){
            sqlCondition = " SELECT d.zt_id as ztId FROM base_doctor d LEFT JOIN base_doctor_hospital dh ON d.id=dh.doctor_code where d.del=1 and dh.del=1 and dh.dept_code='"+dept+"' ";
        }
        if (StringUtils.isNoneBlank(doctorId)){
            sqlCondition = " SELECT d.zt_id as ztId FROM base_doctor d where d.id = '"+doctorId+"' ";
        }
        List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sqlCondition);
        String str = "";
        if (mapList!=null&&mapList.size()!=0){
            for (Map<String,Object> map:mapList){
                str += "'"+map.get("ztId")+"',";
            }
        }
        str = str.substring(0,str.length()-1);
        sqlCondition = " ";
        if (StringUtils.isNotBlank(startDate)){
            sqlCondition += " and lastEditedDate>='"+startDate+"' ";
        }
        if (StringUtils.isNotBlank(endDate)){
            sqlCondition += " and lastEditedDate<='"+endDate+"' ";
        }
        String sql = "  select * from ( " +
                " select count(distinct id) total,'resolve' `status` from zt_bug " +
                " where  (resolvedBy in ("+str+")) or  " +
                " (assignedTo in ("+str+") and `status` in ('closed')) or " +
                " (closedBy in ("+str+")and `status` in ('closed')) " +
                "  and deleted='0' " +sqlCondition+
                " union ALL " +
                " select count(distinct id) total,'unresolved' `status` from zt_bug " +
                " where assignedTo in ("+str+") and `status` in ('active','resolved') and deleted='0' " +sqlCondition+
                " )A ";
        String url = "http://172.19.103.134:10023/ykyy/jdbcSQLQuery";
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
        HttpResponse response = HttpUtils.doGet(url,params);
        String content = response.getContent();
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Long total = 0l;//总bug数;
        Long resolveBugTotal=0l;//已解决BUG数
        Long unresolvedBugTotal=0l;//待解决BUG数
        Integer status = rs.getInteger("status");
        if(status!=null&&status == 200){
            JSONArray array = rs.getJSONArray("detailModelList");
            if (array!=null&&array.size()!=0){
                total = array.stream().mapToLong(t ->((JSONObject)t).get("total") == null ? 0 :Long.parseLong(((JSONObject)t).getString("total"))).sum();
                for (int i=0;i<array.size();i++){
                    JSONObject tmp = array.getJSONObject(i);
                    String bugStatus = tmp.getString("status");
                    Long statusTotal  =Long.parseLong(tmp.getString("total"));
                    if("resolve".equals(bugStatus)){
                        resolveBugTotal = statusTotal;
                    }else {
                        unresolvedBugTotal = statusTotal;
                    }
                }
            }
        }
        JSONObject result = new JSONObject();
        result.put("bugtotal",total);
        result.put("resolveBugTotal",resolveBugTotal);
        result.put("unresolvedBugTotal",unresolvedBugTotal);
        return result;
    }
}

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetCommonService.java

@@ -1194,7 +1194,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                // 获取监管平台唯一标识
                String visitDocCode = achNsDoctorRecord(info.get("docIdcard").toString());
                String trialDocCode =  achNsDoctorRecord("362531198407290348");
                String trialDocCode =  achNsDoctorRecord("350104197904305425");
                jb.put("id_prescription", orgCode +"_"+ (String)info.get("id"));
                jb.put("pres_no",info.get("real_order")== null?"0":info.get("real_order"));
@@ -1230,8 +1230,8 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                jb.put("pres_doc_name", info.get("doctor_name")== null?"0":info.get("doctor_name"));
                jb.put("pres_doc_id_no", info.get("docIdcard")== null?"0":info.get("docIdcard"));
                jb.put("trial_doc_code", trialDocCode);
                jb.put("trial_doc_name", "陈丽玲");
                jb.put("trial_doc_id_no","350524198906247742");
                jb.put("trial_doc_name", "陈燕莺");
                jb.put("trial_doc_id_no","350104197904305425");
        /*        jb.put("trial_doc_name", "乐女金");
                jb.put("trial_doc_id_no","362531198407290348");*/
                jb.put("diag_code", info.get("icd10"));

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorDO.java

@@ -310,6 +310,16 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
    private String identity;//身份1是总经理，0是员工
    private String ztId;//禅道用户id
    public String getZtId() {
        return ztId;
    }
    public void setZtId(String ztId) {
        this.ztId = ztId;
    }
    public String getIdentity() {
        return identity;
    }

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

@@ -0,0 +1,78 @@
package com.yihu.jw.entity.hospital.article;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * 新闻动态
 * Created by yeshijie on 2022/11/7.
 */
@Entity
@Table(name = "base_news_article")
public class BaseNewsArticleDO extends UuidIdentityEntityWithCreateTime {
    private String articleId;//文章id
    private Integer sort;//排序
    private String status;//状态（1生效 0失效）
    private String statusName;//状态（1生效 0失效）
    private String articleName;//文章名称
    private String image;//文章封面
    @Column(name = "article_id")
    public String getArticleId() {
        return articleId;
    }
    public void setArticleId(String articleId) {
        this.articleId = articleId;
    }
    @Column(name = "sort")
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    @Column(name = "status")
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Transient
    public String getStatusName() {
        return statusName;
    }
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
    @Transient
    public String getArticleName() {
        return articleName;
    }
    public void setArticleName(String articleName) {
        this.articleName = articleName;
    }
    @Transient
    public String getImage() {
        return image;
    }
    public void setImage(String image) {
        this.image = image;
    }
}

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/config/MultipartConfig.java

@@ -2,6 +2,7 @@ package com.yihu.jw.gateway.config;
import com.yihu.jw.gateway.filter.CsrfFilter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.context.annotation.Bean;
@@ -19,10 +20,13 @@ public class MultipartConfig {
    @Autowired
    CsrfFilter csrfFilter;
    @Value("${server.tomcat.basedir}")
    String tomcatLocation;
    @Bean
    MultipartConfigElement multipartConfigElement() {
        MultipartConfigFactory factory = new MultipartConfigFactory();
        String location = "/data/apps/temp";
        String location = tomcatLocation;
        File tmpFile = new File(location);
        if (!tmpFile.exists()) {
            tmpFile.mkdirs();

gateway/ag-basic/src/main/resources/application.yml

@@ -1,7 +1,7 @@
server:
  port: ${server.ag-basic-port}
  tomcat:
    basedir: /data/apps/temp
    basedir: /data1/apps/temp1
    max-http-form-post-size: -1
  max-http-header-size: 102400

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -428,9 +428,10 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                throw new UnsupportedGrantTypeException("Unsupported grant type: " + tokenRequest.getGrantType());
            }
        boolean past = testPwd(parameters.get("password"));
        if (!"family".equals(flag)) {
            if (!past) {
            //账户密码登录的才验证密码强度
        String grant_type = parameters.get("grant_type");
        if ("password".equals(grant_type)) {
            if (!testPwd(parameters.get("password"))) {
                throw new PwdException("密码强度低，请用验证码登录，或者修改密码后在从新登录！");
            }
        }

svr/svr-base/src/main/java/com/yihu/jw/base/config/MultipartConfig.java

@@ -1,5 +1,6 @@
package com.yihu.jw.base.config;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.servlet.MultipartConfigFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -12,10 +13,14 @@ import java.io.*;
@Configuration
public class MultipartConfig {
    @Value("${server.tomcat.basedir}")
    String tomcatLocation;
    @Bean
    MultipartConfigElement multipartConfigElement() {
        MultipartConfigFactory factory = new MultipartConfigFactory();
        String location = "/data/apps/temp2";
        String location = tomcatLocation;
        File tmpFile = new File(location);
        if (!tmpFile.exists()) {
            tmpFile.mkdirs();

svr/svr-base/src/main/java/com/yihu/jw/base/dao/article/BaseNewsArticleDao.java

@@ -0,0 +1,13 @@
package com.yihu.jw.base.dao.article;
import com.yihu.jw.entity.hospital.article.BaseNewsArticleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by yeshijie on 2022/11/7.
 */
public interface BaseNewsArticleDao extends PagingAndSortingRepository<BaseNewsArticleDO, String>, JpaSpecificationExecutor<BaseNewsArticleDO> {
}

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

@@ -10,13 +10,10 @@ import com.yihu.jw.base.service.article.KnowledgeArticleService;
import com.yihu.jw.base.service.article.KnowledgeArticleUserService;
import com.yihu.jw.base.service.article.KnowledgeCategoryService;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.entity.hospital.article.KnowledgeCategoryDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -61,6 +58,66 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
	private UserDao userdao;
	@Autowired
	private RoleDao roleDao;
	@GetMapping(value = "findPageByArticleName")
	@ApiOperation(value = "获取新闻动态列表")
	public Envelop findPageByArticleName(
			@ApiParam(name = "articleName", value = "文章标题")
			@RequestParam(value = "articleName", required = false) String articleName,
			@ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
			@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){
		try {
			return knowledgeArticleService.findPageByArticleName(articleName, page, pageSize);
		}catch (Exception e){
			return failedException(e);
		}
	}
	@GetMapping(value = "findNewsArticle")
	@ApiOperation(value = "按id获取新闻动态")
	public Envelop findNewsArticle(
			@ApiParam(name = "id", value = "id",required = true)
			@RequestParam(value = "id", required = true) String id){
		try {
			return success("获取成功",knowledgeArticleService.findNewsArticle(id));
		}catch (Exception e){
			return failedException(e);
		}
	}
	@PostMapping(value = "delNewsArticle")
	@ApiOperation(value = "获取新闻动态列表")
	public Envelop delNewsArticle(
			@ApiParam(name = "id", value = "id",required = true)
			@RequestParam(value = "id", required = true) String id){
		try {
			knowledgeArticleService.delNewsArticle(id);
			return success("删除成功");
		}catch (Exception e){
			return failedException(e);
		}
	}
	@PostMapping(value = "addNewArticle")
	@ApiOperation(value = "新增或修改新闻动态列表")
	public Envelop addNewArticle(
			@ApiParam(name = "id", value = "id",required = false)
			@RequestParam(value = "id", required = false) String id,
			@ApiParam(name = "articleId", value = "文章id")
			@RequestParam(value = "articleId", required = true) String articleId,
			@ApiParam(name = "sort", value = "排序", required = true)
			@RequestParam(value = "sort", required = true)Integer sort,
			@ApiParam(name = "status", value = "状态", required = true)
			@RequestParam(value = "status", required = true)String status){
		try {
			return success("操作成功",knowledgeArticleService.addNewArticle(id,articleId,sort,status));
		}catch (Exception e){
			return failedException(e);
		}
	}
	
	@GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.searchKnowledgePageList)
	@ApiOperation(value = "获取文章列表")

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

@@ -6,7 +6,6 @@ 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;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -79,4 +78,30 @@ public class BaseMenuNoLoginEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "findPageByArticleName")
    @ApiOperation(value = "获取新闻动态列表")
    public Envelop findPageByArticleName(
            @ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
            @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){
        try {
            return knowledgeArticleService.findPageByArticleName(null, page, pageSize);
        }catch (Exception e){
            return failedException(e);
        }
    }
    @GetMapping(value = "findNewsArticle")
    @ApiOperation(value = "按id获取新闻动态")
    public Envelop findNewsArticle(
            @ApiParam(name = "id", value = "id",required = true)
            @RequestParam(value = "id", required = true) String id){
        try {
            return success("获取成功",knowledgeArticleService.findNewsArticle(id));
        }catch (Exception e){
            return failedException(e);
        }
    }
}

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

@@ -2,9 +2,9 @@ package com.yihu.jw.base.service.article;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.article.KnowledgeArticleDictDao;
import com.yihu.jw.base.dao.article.BaseNewsArticleDao;
import com.yihu.jw.base.dao.article.KnowledgeArticleDeptDao;
import com.yihu.jw.base.dao.article.KnowledgeArticleMenuDao;
import com.yihu.jw.base.dao.article.KnowledgeArticleDictDao;
import com.yihu.jw.base.dao.article.KnowledgeArticleUserDao;
import com.yihu.jw.base.dao.menu.BaseMenuDictDao;
import com.yihu.jw.base.dao.user.UserDao;
@@ -15,19 +15,19 @@ 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.user.UserDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.BaseNewsArticleDO;
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;
import com.yihu.jw.entity.hospital.survey.WlyySurveyUserDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.survey.dao.SurveyTemplateDao;
import com.yihu.jw.hospital.survey.dao.SurveyUserDao;
import com.yihu.jw.patient.dao.BasePatientBusinessDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.utils.EntityUtils;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
@@ -73,6 +73,89 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
    private HibenateUtils hibenateUtils;
	@Autowired
	private UserDao userDao;
	@Autowired
	private BaseNewsArticleDao baseNewsArticleDao;
	/**
	 * 新闻动态分页
	 * @return
	 */
	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 " +
				"WHERE a.article_id = d.id " ;
		String sqlCount = "SELECT count(a.id) from base_news_article a,wlyy_knowledge_article_dict d  " +
				" WHERE a.article_id = d.id ";
		String filter = " ";
		String limit = " limit "+(page-1)*size+","+size;
		if (StringUtils.isNotBlank(articleName)){
			filter +="and d.title like '%"+articleName+"%'";
		}
		List<Map<String, Object>> list = jdbcTemplate.queryForList(sql + filter+limit);
		for (Map<String,Object> map:list){
		}
		Long count = jdbcTemplate.queryForObject(sqlCount+filter,Long.class);
		return PageEnvelop.getSuccessListWithPage("success",list,page,size,count);
	}
	/**
	 * 删除新闻动态
	 */
	public void delNewsArticle(String id){
		if(baseNewsArticleDao.exists(id)){
			baseNewsArticleDao.delete(id);
		}
	}
	/**
	 * 按id查找
	 * @param id
	 * @return
	 */
	public BaseNewsArticleDO findNewsArticle(String id){
		BaseNewsArticleDO baseNewsArticleDO = baseNewsArticleDao.findOne(id);
		if(baseNewsArticleDO!=null){
			if(StringUtils.isNotBlank(baseNewsArticleDO.getArticleId())){
				KnowledgeArticleDictDO dictDO = knowledgeArticleDictDao.findByIdAndDel(baseNewsArticleDO.getArticleId());
				if(dictDO!=null){
					baseNewsArticleDO.setArticleName(dictDO.getTitle());
					baseNewsArticleDO.setImage(dictDO.getImage());
				}
			}
			baseNewsArticleDO.setStatusName("1".equals(baseNewsArticleDO.getStatus())?"生效":"失效");
		}
		return baseNewsArticleDO;
	}
	/**
	 * 新增或修改新闻动态
	 * @return
	 */
	public BaseNewsArticleDO addNewArticle(String id,String articleId,Integer sort,String status){
		if(StringUtils.isNotBlank(id)){
			BaseNewsArticleDO baseNewsArticleDO = baseNewsArticleDao.findOne(id);
			baseNewsArticleDO.setArticleId(articleId);
			baseNewsArticleDO.setSort(sort);
			baseNewsArticleDO.setStatus(status);
			baseNewsArticleDao.save(baseNewsArticleDO);
			return baseNewsArticleDO;
		}else {
			BaseNewsArticleDO baseNewsArticleDO = new BaseNewsArticleDO();
			baseNewsArticleDO.setArticleId(articleId);
			baseNewsArticleDO.setSort(sort);
			baseNewsArticleDO.setStatus(status);
			baseNewsArticleDO.setCreateTime(new Date());
			baseNewsArticleDao.save(baseNewsArticleDO);
			return baseNewsArticleDO;
		}
	}
	//查询文章列表
	public List<Map<String,Object>> findArticleList(String first,String second ,String key,Integer page ,Integer pageSize){
		String sql ="select b.id as \"id\", " +

svr/svr-base/src/main/resources/application.yml

@@ -2,7 +2,7 @@
server:
  port: ${server.svr-base-port}
  tomcat:
    basedir: /data/apps/temp2
    basedir: /data1/apps/temp2
express:
  sf_url: http://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
  sf_code: JKZL

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/common/CommonController.java

@@ -6,6 +6,8 @@ import com.yihu.jw.care.util.MessageUtil;
import com.yihu.jw.care.util.WeatherUtil;
import com.yihu.jw.entity.care.weather.BaseWeatherDayDO;
import com.yihu.jw.entity.care.weather.BaseWeatherWeekDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -20,6 +22,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
@@ -36,7 +39,23 @@ public class CommonController extends EnvelopRestEndpoint {
    private WeatherUtil weatherUtil;
    @Autowired
    private PatientMessageService patientMessageService;
    @Resource
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    @GetMapping(value = "open/getCloudCareUrl")
    @ApiOperation(value = "获取云照护url")
    public ObjEnvelop getCloudCareUrl() {
        try {
            String url = "";
            WlyyHospitalSysDictDO dictDO = wlyyHospitalSysDictDao.findById("getCloudCareUrl");
            if(dictDO!=null){
                url = dictDO.getDictValue();
            }
            return ObjEnvelop.getSuccess("获取成功",url);
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
    @GetMapping(value = "weather")
    @ApiOperation(value = "获取天气数据")

svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@@ -614,3 +614,47 @@ express:
  sf_url: http://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
  sf_code: WH000061
  sf_check_word: BEWFSCXSyjt4314rz
---
#海沧医院内网
spring:
  profiles: ZjxlProd
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://192.168.1.103:4406/zentao?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: jkzlehr
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
demo:
  flag: false
#支付支付
pay:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://192.168.118.240:3000/
  data_base_name: im
fastDFS:
  fastdfs_file_url: http://127.0.0.1:8888/
fast-dfs:
  tracker-server: :22122 #服务器地址
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
wechat:
  id: xm_xzzx_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
  url: http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage
express:
  sf_url: http://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
  sf_code: WH000061
  sf_check_word: BEWFSCXSyjt4314rz